GNAP: group first scenes, rename intro

24 files changed, 3932 insertions, 4450 deletions

diff --git a/engines/gnap/module.mk b/engines/gnap/module.mk
index bb565eb276..0e1271a167 100644
--- a/engines/gnap/module.mk
+++ b/engines/gnap/module.mk
@@ -11,16 +11,8 @@ MODULE_OBJS := \
 	resource.o \
 	sound.o \
 	scenes/groupcs.o \
-	scenes/scene00.o \
-	scenes/scene01.o \
-	scenes/scene02.o \
-	scenes/scene03.o \
-	scenes/scene04.o \
-	scenes/scene05.o \
-	scenes/scene06.o \
-	scenes/scene07.o \
-	scenes/scene08.o \
-	scenes/scene09.o \
+	scenes/group0.o \
+	scenes/intro.o \
 	scenes/scene10.o \
 	scenes/scene11.o \
 	scenes/scene12.o \
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
new file mode 100644
index 0000000000..5e455555a7
--- /dev/null
+++ b/engines/gnap/scenes/group0.cpp
@@ -0,0 +1,3733 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#include "gnap/gnap.h"
+#include "gnap/gamesys.h"
+#include "gnap/resource.h"
+#include "gnap/scenes/group0.h"
+
+namespace Gnap {
+
+enum {
+	kHS01Platypus	= 0,
+	kHS01ExitTruck	= 1,
+	kHS01Mud		= 2,
+	kHS01Pigs		= 3,
+	kHS01Spaceship	= 4,
+	kHS01Device		= 5,
+	kHS01WalkArea1	= 6,
+	kHS01WalkArea2	= 7,
+	kHS01WalkArea3	= 8,
+	kHS01WalkArea4	= 9,
+	kHS01WalkArea5	= 10,
+	kHS01WalkArea6	= 11,
+	kHS01WalkArea7	= 12,
+	kHS01WalkArea8	= 13
+};
+
+enum {
+	kAS01LookSpaceship		= 1,
+	kAS01LookSpaceshipDone	= 2,
+	kAS01LeaveScene			= 3,
+	kAS01TakeMud			= 5,
+	kAS01LookPigs			= 6,
+	kAS01UsePigs			= 7
+};
+
+Scene01::Scene01(GnapEngine *vm) : Scene(vm) {
+	_pigsIdCtr = 0;
+	_smokeIdCtr = 0;
+	_spaceshipSurface = nullptr;
+}
+
+Scene01::~Scene01() {
+	delete _spaceshipSurface;
+}
+
+int Scene01::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 3);
+	return 0x88;
+}
+
+void Scene01::updateHotspots() {
+	_vm->setHotspot(kHS01Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS01ExitTruck, 780, 226, 800, 455, SF_EXIT_R_CURSOR | SF_WALKABLE, 10, 6);
+	_vm->setHotspot(kHS01Mud, 138, 282, 204, 318, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 5);
+	_vm->setHotspot(kHS01Pigs, 408, 234, 578, 326, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 4);
+	_vm->setHotspot(kHS01Spaceship, 0, 200, 94, 292, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 1, 6);
+	_vm->setHotspot(kHS01WalkArea1, 0, 0, 162, 426);
+	_vm->setHotspot(kHS01WalkArea2, 162, 0, 237, 396);
+	_vm->setHotspot(kHS01WalkArea3, 237, 0, 319, 363);
+	_vm->setHotspot(kHS01WalkArea4, 520, 0, 800, 404);
+	_vm->setHotspot(kHS01WalkArea5, 300, 447, 800, 600);
+	_vm->setHotspot(kHS01WalkArea6, 678, 0, 800, 404);
+	_vm->setHotspot(kHS01WalkArea7, 0, 0, 520, 351);
+	_vm->setHotspot(kHS01WalkArea8, 0, 546, 300, 600);
+	_vm->setDeviceHotspot(kHS01Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS01Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	if (_vm->isFlag(kGFMudTaken))
+		_vm->_hotspots[kHS01Mud]._flags = SF_WALKABLE | SF_DISABLED;
+	_vm->_hotspotsCount = 14;
+}
+
+void Scene01::run() {
+	// NOTE Removed _s01_dword_474380 which was set when the mud was taken
+	// which is also set in the global game flags.
+	
+	_vm->playSound(0x1091C, true);
+	_vm->startSoundTimerC(5);
+
+	_vm->_gameSys->setAnimation(134, 20, 4);
+	_vm->_gameSys->insertSequence(134, 20, 0, 0, kSeqNone, 0, 0, 0);
+
+	_vm->_gameSys->setAnimation(0x7F, 40, 2);
+	_vm->_gameSys->insertSequence(0x7F, 40, 0, 0, kSeqNone, 0, 0, 0);
+
+	_vm->_timers[4] = _vm->getRandom(100) + 300;
+
+	if (!_vm->isFlag(kGFMudTaken))
+		_vm->_gameSys->insertSequence(129, 40, 0, 0, kSeqNone, 0, 0, 0);
+
+	_vm->queueInsertDeviceIcon();
+
+	if (_vm->_prevSceneNum == 2) {
+		_vm->initGnapPos(11, 6, kDirBottomLeft);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(12, 6, kDirUnk4);
+		_vm->endSceneInit();
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->platypusWalkTo(9, 6, -1, 0x107C2, 1);
+		_vm->gnapWalkTo(8, 6, -1, 0x107B9, 1);
+	} else {
+		_vm->initGnapPos(1, 6, kDirBottomRight);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(1, 7, kDirNone);
+		_vm->endSceneInit();
+	}
+
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+		_vm->testWalk(0, 3, -1, -1, -1, -1);
+
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+
+		switch (_vm->_sceneClickedHotspot) {
+		
+		case kHS01Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+
+		case kHS01Platypus:
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapKissPlatypus(0);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS01Spaceship:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 2);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpLeft;
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
+							_vm->_gnapActionStatus = kAS01LookSpaceship;
+						break;
+					case GRAB_CURSOR:
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS01Mud:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 3);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(3, 3);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 3) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS01TakeMud;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS01Pigs:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 7, 2);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS01LookPigs;
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS01UsePigs;
+						break;
+					case TALK_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 7, 2) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS01LookPigs;
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS01ExitTruck:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107AB, 1);
+				_vm->_gnapActionStatus = kAS01LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, -1, 0x107CD, 1);
+				_vm->_newSceneNum = 2;
+			}
+			break;
+
+		case kHS01WalkArea1:
+		case kHS01WalkArea2:
+		case kHS01WalkArea3:
+		case kHS01WalkArea4:
+		case kHS01WalkArea5:
+		case kHS01WalkArea6:
+		case kHS01WalkArea7:
+		case kHS01WalkArea8:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+
+		}
+
+		updateAnimations();
+
+		if (!_vm->isSoundPlaying(0x1091C))
+			_vm->playSound(0x1091C, true);
+
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
+				_vm->updatePlatypusIdleSequence();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence();
+			if (_vm->_timers[4] == 0) {
+				// Update bird animation
+				_vm->_timers[4] = _vm->getRandom(100) + 300;
+				if (_vm->getRandom(1) == 0)
+					_vm->_gameSys->insertSequence(0x84, 180, 0, 0, kSeqNone, 0, 0, 0);
+				else
+					_vm->_gameSys->insertSequence(0x83, 180, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			_vm->playSoundC();
+		}
+
+		_vm->checkGameKeys();
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene01::updateAnimations() {	
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS01LookSpaceship:
+			_spaceshipSurface = _vm->_gameSys->createSurface(47);
+			_vm->_gameSys->insertSpriteDrawItem(_spaceshipSurface, 0, 0, 255);
+			_vm->_gameSys->setAnimation(133, 256, 0);
+			_vm->_gameSys->insertSequence(133, 256, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gnapActionStatus = kAS01LookSpaceshipDone;
+			break;
+
+		case kAS01LookSpaceshipDone:
+			_vm->_gameSys->removeSequence(133, 256, true);
+			_vm->_gameSys->removeSpriteDrawItem(_spaceshipSurface, 255);
+			_vm->deleteSurface(&_spaceshipSurface);
+			_vm->_gnapActionStatus = -1;
+			break;
+
+		case kAS01LeaveScene:
+			_vm->_sceneDone = true;
+			break;
+
+		case kAS01TakeMud:
+			_vm->playGnapPullOutDevice(2, 3);
+			_vm->playGnapUseDevice(0, 0);
+			_vm->_gameSys->insertSequence(128, 40, 129, 40, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(128, 40, 3);
+			_vm->_gnapActionStatus = -1;
+			break;
+
+		case kAS01LookPigs:
+			_vm->playSound(138, false);
+			_vm->playSound(139, false);
+			_vm->playSound(140, false);
+			_vm->_gnapActionStatus = -1;
+			break;
+
+		case kAS01UsePigs:
+			_vm->playGnapPullOutDevice(7, 2);
+			_vm->playGnapUseDevice(0, 0);
+			_vm->_gameSys->insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0);
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+
+	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 3);
+		_vm->invAdd(kItemMud);
+		_vm->setGrabCursorSprite(kItemMud);
+		_vm->setFlag(kGFMudTaken);
+		updateHotspots();
+	}
+
+	if (_vm->_gameSys->getAnimationStatus(4) == 2) {
+		_smokeIdCtr = (_smokeIdCtr + 1) % 2;
+		_vm->_gameSys->setAnimation(0x86, _smokeIdCtr + 20, 4);
+		_vm->_gameSys->insertSequence(0x86, _smokeIdCtr + 20,
+			0x86, (_smokeIdCtr + 1) % 2 + 20,
+			kSeqSyncWait, 0, 0, 0);
+	}
+
+	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
+		_pigsIdCtr = (_pigsIdCtr + 1) % 2;
+		_vm->_gameSys->setAnimation(0x7F, _pigsIdCtr + 40, 2);
+		_vm->_gameSys->insertSequence(0x7F, _pigsIdCtr + 40,
+			0x7F, (_pigsIdCtr + 1) % 2 + 40,
+			kSeqSyncWait, 0, 0, 0);
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS02Platypus	= 0,
+	kHS02Chicken	= 1,
+	kHS02Truck1		= 2,
+	kHS02Truck2		= 3,
+	kHS02TruckGrill	= 4,
+	kHS02Device		= 5,
+	kHS02ExitHouse	= 6,
+	kHS02ExitBarn	= 7,
+	kHS02ExitCreek	= 8,
+	kHS02ExitPigpen	= 9,
+	kHS02WalkArea1	= 10,
+	kHS02WalkArea2	= 11,
+	kHS02WalkArea3	= 12,
+	kHS02WalkArea4	= 13
+};
+
+enum {
+	kAS02UseTruckNoKeys			= 0,
+	kAS02UseGasWithTruck		= 1,
+	kAS02UseTruckGas			= 2,
+	kAS02UseTruckNoGas			= 3,
+	kAS02GrabTruckGrill			= 5,
+	kAS02LeaveScene				= 6,
+	kAS02TalkChicken			= 7,
+	kAS02GrabChicken			= 8,
+	kAS02GrabChickenDone		= 9,
+	kAS02UseTruckNoKeysDone		= 11,
+	kAS02UseGasWithTruckDone	= 12,
+	kAS02UseTwigWithChicken		= 16
+};
+
+Scene02::Scene02(GnapEngine *vm) : Scene(vm) {
+	_truckGrillCtr = 0;
+	_nextChickenSequenceId = 0;
+	_currChickenSequenceId = 0;
+	_gnapTruckSequenceId = 0;
+}
+
+int Scene02::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	return _vm->isFlag(kGFTruckKeysUsed) ? 0x15A : 0x15B;
+}
+
+void Scene02::updateHotspots() {
+	_vm->setHotspot(kHS02Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE);
+	_vm->setHotspot(kHS02Chicken, 606, 455, 702, 568, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 7, 8);
+	_vm->setHotspot(kHS02Truck1, 385, 258, 464, 304, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 5);
+	_vm->setHotspot(kHS02Truck2, 316, 224, 390, 376, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 6);
+	_vm->setHotspot(kHS02TruckGrill, 156, 318, 246, 390, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 7);
+	_vm->setHotspot(kHS02ExitHouse, 480, 120, 556, 240, SF_EXIT_U_CURSOR, 7, 5);
+	_vm->setHotspot(kHS02ExitBarn, 610, 0, 800, 164, SF_EXIT_U_CURSOR, 10, 5);
+	_vm->setHotspot(kHS02ExitCreek, 780, 336, 800, 556, SF_EXIT_R_CURSOR | SF_WALKABLE, 10, 8);
+	_vm->setHotspot(kHS02ExitPigpen, 0, 300, 20, 600, SF_EXIT_L_CURSOR | SF_WALKABLE, 0, 8);
+	_vm->setHotspot(kHS02WalkArea1, 92, 140, 304, 430, 0, 3, 1);
+	_vm->setHotspot(kHS02WalkArea2, 0, 0, 800, 380);
+	_vm->setHotspot(kHS02WalkArea3, 0, 0, 386, 445);
+	_vm->setHotspot(kHS02WalkArea4, 386, 0, 509, 410);
+	_vm->setDeviceHotspot(kHS02Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS02Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	_vm->_hotspotsCount = 14;
+}
+
+void Scene02::run() {
+	_vm->playSound(0x1091C, true);
+	_vm->startSoundTimerC(6);
+
+	_currChickenSequenceId = 0x14B;
+	_vm->_gameSys->setAnimation(0x14B, 179, 2);
+	_vm->_gameSys->insertSequence(0x14B, 179, 0, 0, kSeqNone, 0, 0, 0);
+
+	_nextChickenSequenceId = -1;
+	_vm->_timers[5] = _vm->getRandom(20) + 30;
+	_vm->_timers[4] = _vm->getRandom(100) + 300;
+	
+	_vm->queueInsertDeviceIcon();
+	
+	switch (_vm->_prevSceneNum) {
+	case 3:
+		_vm->initGnapPos(11, 6, kDirBottomLeft);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(12, 6, kDirUnk4);
+		_vm->endSceneInit();
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->platypusWalkTo(9, 6, -1, 0x107C2, 1);
+		_vm->gnapWalkTo(8, 6, -1, 0x107BA, 1);
+		break;
+	case 4:
+		_vm->initGnapPos(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, kDirBottomLeft);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, kDirUnk4);
+		_vm->endSceneInit();
+		_vm->gnapWalkTo(7, 6, 0, 0x107B9, 1);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->platypusWalkTo(8, 6, 1, 0x107C2, 1);
+		updateHotspots();
+		_vm->_gameSys->waitForUpdate();
+		break;
+	case 47:
+		_vm->clearFlag(kGFUnk25);
+		_vm->initGnapPos(5, 6, kDirBottomLeft);
+		_vm->initPlatypusPos(6, 7, kDirUnk4);
+		_vm->endSceneInit();
+		break;
+	case 49:
+		_vm->initGnapPos(5, 6, kDirBottomRight);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(6, 7, kDirNone);
+		_vm->endSceneInit();
+		break;
+	default:
+		_vm->initGnapPos(-1, 6, kDirBottomRight);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(-1, 7, kDirNone);
+		_vm->endSceneInit();
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->platypusWalkTo(2, 7, -1, 0x107C2, 1);
+		_vm->gnapWalkTo(2, 8, -1, 0x107B9, 1);
+		break;
+	}
+	
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();	
+		_vm->updateCursorByHotspot();
+	
+		_vm->testWalk(0, 6, 7, 6, 8, 6);
+	
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS02Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+
+		case kHS02Platypus:
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapKissPlatypus(0);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS02Chicken:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemTwig) {
+					_vm->_gnapIdleFacing = kDirUpRight;
+					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1,
+						0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+					_vm->_gnapActionStatus = kAS02UseTwigWithChicken;
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, 9, 8);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(9, 8);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
+							_vm->_gnapActionStatus = kAS02GrabChicken;
+						else
+							_vm->_gnapActionStatus = -1;
+						break;
+					case TALK_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS02TalkChicken;
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS02Truck1:
+		case kHS02Truck2:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemKeys) {
+					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1)) {
+						_vm->setGrabCursorSprite(-1);
+						_vm->invRemove(kItemKeys);
+						if (_vm->isFlag(kGFTruckFilledWithGas))
+							_vm->_gnapActionStatus = kAS02UseTruckGas;
+						else
+							_vm->_gnapActionStatus = kAS02UseTruckNoGas;
+					}
+				} else if (_vm->_grabCursorSpriteIndex == kItemGas) {
+					_vm->_hotspots[kHS02WalkArea4]._flags |= SF_WALKABLE;
+					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1))
+						_vm->_gnapActionStatus = kAS02UseGasWithTruck;
+					_vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE;
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 2);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(2, 2);
+						break;
+					case GRAB_CURSOR:
+						if (_vm->isFlag(kGFTruckKeysUsed)) {
+							if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1)) {
+								if (_vm->isFlag(kGFTruckFilledWithGas))
+									_vm->_gnapActionStatus = kAS02UseTruckGas;
+								else
+									_vm->_gnapActionStatus = kAS02UseTruckNoGas;
+							}
+						} else {
+							_vm->_gnapIdleFacing = kDirUnk4;
+							if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1))
+								_vm->_gnapActionStatus = kAS02UseTruckNoKeys;
+						}
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS02TruckGrill:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 2, 4);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(2, 4);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS02GrabTruckGrill;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS02ExitHouse:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 0, 0x107AD, 1);
+				_vm->_gnapActionStatus = kAS02LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, -1, 0x107C1, 1);
+				updateHotspots();
+				_vm->_newSceneNum = 4;
+			}
+			break;
+
+		case kHS02ExitBarn:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, 0x107AD, 1);
+				_vm->_gnapActionStatus = kAS02LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[7].x + 1, _vm->_hotspotsWalkPos[7].y, -1, 0x107C1, 1);
+				updateHotspots();
+				_vm->_newSceneNum = 5;
+			}
+			break;
+
+		case kHS02ExitCreek:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1);
+				_vm->_gnapActionStatus = kAS02LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, -1, 0x107CD, 1);
+				_vm->_newSceneNum = 3;
+			}
+			break;
+
+		case kHS02ExitPigpen:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, 0, 0x107AF, 1);
+				_vm->_gnapActionStatus = kAS02LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, -1, 0x107CF, 1);
+				_vm->_newSceneNum = 1;
+			}
+			break;
+
+		case kHS02WalkArea1:
+		case kHS02WalkArea2:
+		case kHS02WalkArea3:
+		case kHS02WalkArea4:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+		}
+	
+		updateAnimations();
+	
+		if (!_vm->isSoundPlaying(0x1091C))
+			_vm->playSound(0x1091C, true);
+	
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
+				_vm->updatePlatypusIdleSequence();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[4]) {
+				// Update bird animation
+				_vm->_timers[4] = _vm->getRandom(100) + 300;
+				if (_vm->getRandom(2) != 0)
+					_vm->_gameSys->insertSequence(0x156, 256, 0, 0, kSeqNone, 0, 0, 0);
+				else
+					_vm->_gameSys->insertSequence(0x154, 256, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			if (!_vm->_timers[5] && _nextChickenSequenceId == -1 && _vm->_gnapActionStatus != 7 && _vm->_gnapActionStatus != 8) {
+				if (_vm->getRandom(6) != 0) {
+					_nextChickenSequenceId = 0x14B;
+					_vm->_timers[5] = _vm->getRandom(20) + 30;
+				} else {
+					_nextChickenSequenceId = 0x14D;
+					_vm->_timers[5] = _vm->getRandom(20) + 50;
+				}
+			}
+			_vm->playSoundC();
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene02::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		switch (_vm->_gnapActionStatus) {
+		case kAS02UseTruckNoKeys:
+			_vm->_gameSys->insertSequence(0x14E, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x14E, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x14E;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS02UseTruckNoKeysDone;
+			break;
+		case kAS02UseGasWithTruck:
+			_vm->_gameSys->insertSequence(0x151, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x151, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x151;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->invRemove(kItemGas);
+			_vm->setGrabCursorSprite(-1);
+			_vm->setFlag(kGFTruckFilledWithGas);
+			_vm->_gnapActionStatus = kAS02UseGasWithTruckDone;
+			break;
+		case kAS02UseTruckGas:
+			_vm->_timers[5] = 9999;
+			_vm->_timers[4] = 9999;
+			_vm->hideCursor();
+			_vm->setGrabCursorSprite(-1);
+			if (!_vm->isFlag(kGFTruckKeysUsed)) {
+				_vm->_gameSys->insertSequence(0x14F, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+				_vm->_gameSys->waitForUpdate();
+				_vm->setFlag(kGFTruckKeysUsed);
+				_vm->_gnapSequenceId = 0x14F;
+				_vm->_gnapSequenceDatNum = 0;
+				_vm->invRemove(kItemKeys);
+				_vm->setGrabCursorSprite(-1);
+			}
+			_vm->_newSceneNum = 47;
+			_vm->_sceneDone = true;
+			break;
+		case kAS02UseTruckNoGas:
+			_vm->hideCursor();
+			_vm->setGrabCursorSprite(-1);
+			_vm->_timers[4] = 250;
+			if (!_vm->isFlag(kGFTruckKeysUsed)) {
+				_vm->_gameSys->insertSequence(0x14F, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+				_vm->_gameSys->waitForUpdate();
+				_vm->setFlag(kGFTruckKeysUsed);
+				_vm->_gnapSequenceId = 0x14F;
+				_vm->_gnapSequenceDatNum = 0;
+				_vm->invRemove(kItemKeys);
+				_vm->setGrabCursorSprite(-1);
+			}
+			_vm->_newSceneNum = 47;
+			_vm->_sceneDone = true;
+			_vm->setFlag(kGFUnk25);
+			break;
+		case kAS02GrabTruckGrill:
+			switch (_truckGrillCtr) {
+			case 0:
+				_gnapTruckSequenceId = 0x158;
+				break;
+			case 1:
+				_gnapTruckSequenceId = 0x159;
+				break;
+			case 2:
+				_gnapTruckSequenceId = 0x157;
+				break;
+			}
+			_truckGrillCtr = (_truckGrillCtr + 1) % 3;
+			_vm->_gameSys->insertSequence(_gnapTruckSequenceId, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(_gnapTruckSequenceId, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = _gnapTruckSequenceId;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS02LeaveScene:
+			_vm->_sceneDone = true;
+			break;
+		case kAS02TalkChicken:
+			_nextChickenSequenceId = 0x14C;
+			break;
+		case kAS02GrabChicken:
+			_nextChickenSequenceId = 0x150;
+			_vm->_timers[2] = 100;
+			break;
+		case kAS02GrabChickenDone:
+			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId, 0x150, 179, kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+			_vm->_gnapSequenceId = 0x7B5;
+			_vm->_gnapSequenceDatNum = 1;
+			_currChickenSequenceId = 0x14B;
+			_vm->_gameSys->setAnimation(0x14B, 179, 2);
+			_vm->_gameSys->insertSequence(_currChickenSequenceId, 179, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gnapActionStatus = -1;
+			_vm->_timers[5] = 30;
+			break;
+		case kAS02UseTwigWithChicken:
+			_vm->playGnapShowItem(5, 0, 0);
+			_vm->_gameSys->insertSequence(0x155, 179, _currChickenSequenceId, 179, kSeqSyncExists, 0, 0, 0);
+			_currChickenSequenceId = 0x155;
+			_nextChickenSequenceId = -1;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS02UseTruckNoKeysDone:
+		case kAS02UseGasWithTruckDone:
+		default:
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
+		if (_nextChickenSequenceId == 0x150) {
+			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 0);
+			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->removeSequence(_currChickenSequenceId, 179, true);
+			_nextChickenSequenceId = -1;
+			_currChickenSequenceId = -1;
+			_vm->_gnapActionStatus = kAS02GrabChickenDone;
+			_vm->_timers[5] = 500;
+		} else if (_nextChickenSequenceId == 0x14C) {
+			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 2);
+			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, _currChickenSequenceId, 179, kSeqSyncWait, 0, 0, 0);
+			_currChickenSequenceId = _nextChickenSequenceId;
+			_nextChickenSequenceId = -1;
+			_vm->_gnapActionStatus = -1;
+		} else if (_nextChickenSequenceId != -1) {
+			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 2);
+			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, _currChickenSequenceId, 179, kSeqSyncWait, 0, 0, 0);
+			_currChickenSequenceId = _nextChickenSequenceId;
+			_nextChickenSequenceId = -1;
+		}
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS03Platypus			= 0,
+	kHS03Grass				= 1,
+	kHS03ExitTruck			= 2,
+	kHS03Creek				= 3,
+	kHS03TrappedPlatypus	= 4,
+	kHS03Device				= 5,
+	kHS03WalkAreas1			= 6,
+	kHS03WalkAreas2			= 7,
+	kHS03PlatypusWalkArea	= 8,
+	kHS03WalkAreas3			= 9
+};
+
+enum {
+	kAS03LeaveScene			= 0,
+	kAS03FreePlatypus		= 1,
+	kAS03HypnotizePlat		= 2,
+	kAS03HypnotizeScaredPlat= 3,
+	kAS03FreePlatypusDone	= 4,
+	kAS03GrabPlatypus		= 5,
+	kAS03GrabCreek			= 6,
+	kAS03GrabCreekDone		= 7,
+	kAS03GrabScaredPlatypus	= 8
+};
+
+Scene03::Scene03(GnapEngine *vm) : Scene(vm) {
+	_nextPlatSequenceId = -1;
+	_platypusScared = false;
+	_platypusHypnotized = false;
+	_nextFrogSequenceId = -1;
+	_currFrogSequenceId = -1;
+}
+
+int Scene03::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 1);
+	_vm->_gameSys->setAnimation(0, 0, 5);
+	return 0x1CC;
+}
+
+void Scene03::updateHotspots() {
+	_vm->setHotspot(kHS03Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS03Grass, 646, 408, 722, 458, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
+	_vm->setHotspot(kHS03ExitTruck, 218, 64, 371, 224, SF_EXIT_U_CURSOR | SF_WALKABLE, 4, 4);
+	_vm->setHotspot(kHS03Creek, 187, 499, 319, 587, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
+	_vm->setHotspot(kHS03TrappedPlatypus, 450, 256, 661, 414, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 5);
+	_vm->setHotspot(kHS03WalkAreas1, 0, 500, 300, 600);
+	_vm->setHotspot(kHS03WalkAreas2, 300, 447, 800, 600);
+	_vm->setHotspot(kHS03PlatypusWalkArea, 235, 0, 800, 600);
+	_vm->setHotspot(kHS03WalkAreas3, 0, 0, 800, 354);
+	_vm->setDeviceHotspot(kHS03Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS03Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	if (_vm->isFlag(kGFGrassTaken))
+		_vm->_hotspots[kHS03Grass]._flags = SF_WALKABLE | SF_DISABLED;
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS03TrappedPlatypus]._flags = SF_DISABLED;
+	if (_vm->isFlag(kGFPlatypus) || _platypusHypnotized)
+		_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
+	_vm->_hotspotsCount = 10;
+}
+
+void Scene03::run() {
+	_vm->playSound(0x10925, true);
+	_vm->startSoundTimerC(7);
+	
+	_vm->_gameSys->insertSequence(0x1CA, 251, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x1CB, 251, 0, 0, kSeqLoop, 0, 0, 0);
+	
+	_platypusHypnotized = false;
+	
+	_vm->initGnapPos(3, 4, kDirBottomRight);
+	
+	_vm->_gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_currFrogSequenceId = 0x1C6;
+	_nextFrogSequenceId = -1;
+	_vm->_gameSys->setAnimation(0x1C6, 253, 2);
+	
+	_vm->_timers[6] = _vm->getRandom(20) + 30;
+	_vm->_timers[4] = _vm->getRandom(100) + 300;
+	_vm->_timers[5] = _vm->getRandom(100) + 200;
+	
+	if (_vm->isFlag(kGFPlatypus)) {
+		_vm->initPlatypusPos(5, 4, kDirNone);
+	} else {
+		_vm->_timers[1] = _vm->getRandom(40) + 20;
+		_vm->_gameSys->setAnimation(0x1C2, 99, 1);
+		_vm->_gameSys->insertSequence(0x1C2, 99, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->_platypusSequenceId = 0x1C2;
+		_vm->_platypusSequenceDatNum = 0;
+	}
+	
+	_vm->_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (!_vm->isFlag(kGFGrassTaken))
+		_vm->_gameSys->insertSequence(0x1B2, 253, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->queueInsertDeviceIcon();
+	
+	_vm->endSceneInit();
+	
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->platypusWalkTo(4, 7, -1, 0x107C2, 1);
+	_vm->gnapWalkTo(3, 6, -1, 0x107B9, 1);
+	
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS03Platypus:
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapKissPlatypus(0);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS03Grass:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFGrassTaken)) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(9, 6);
+						break;
+					case GRAB_CURSOR:
+						_vm->playGnapPullOutDevice(9, 6);
+						_vm->playGnapUseDevice(0, 0);
+						_vm->_gameSys->insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
+						_vm->_gameSys->setAnimation(0x1B3, 253, 5);
+						_vm->_hotspots[kHS03Grass]._flags |= SF_WALKABLE | SF_DISABLED;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS03ExitTruck:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107AD, 1);
+				_vm->_gnapActionStatus = kAS03LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, -1, 0x107C2, 1);
+				_vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE;
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 2;
+				else
+					_vm->_newSceneNum = 33;
+			}
+			break;
+
+		case kHS03Creek:
+			if (_vm->_gnapActionStatus == -1) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(2, 8);
+						break;
+					case GRAB_CURSOR:
+						if (!_vm->isFlag(kGFPlatypus))
+							_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, _vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y + 1) | 0x10000, 1))
+							_vm->_gnapActionStatus = kAS03GrabCreek;
+						if (!_vm->isFlag(kGFPlatypus))
+							_vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS03TrappedPlatypus:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFPlatypus)) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 4);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(8, 4);
+						break;
+					case GRAB_CURSOR:
+						if (_platypusHypnotized) {
+							_vm->gnapWalkTo(7, 6, 0, 0x107B5, 1);
+							_vm->_gnapActionStatus = kAS03FreePlatypus;
+						} else {
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+							if (_platypusScared)
+								_vm->_gnapActionStatus = kAS03GrabScaredPlatypus;
+							else
+								_vm->_gnapActionStatus = kAS03GrabPlatypus;
+						}
+						break;
+					case TALK_CURSOR:
+						if (_platypusHypnotized) {
+							_vm->playGnapBrainPulsating(8, 4);
+						} else {
+							_vm->_gnapIdleFacing = kDirBottomRight;
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+							if (_platypusScared)
+								_vm->_gnapActionStatus = kAS03HypnotizeScaredPlat;
+							else
+								_vm->_gnapActionStatus = kAS03HypnotizePlat;
+						}
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS03Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+
+		case kHS03WalkAreas1:
+		case kHS03WalkAreas2:
+		case kHS03WalkAreas3:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+
+		case kHS03PlatypusWalkArea:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->isFlag(kGFPlatypus) || _platypusHypnotized) {
+					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				} else {
+					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107B5, 1);
+					if (_platypusScared)
+						_vm->_gnapActionStatus = kAS03GrabScaredPlatypus;
+					else
+						_vm->_gnapActionStatus = kAS03GrabPlatypus;
+				}
+			}
+			break;
+			
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+			
+		}
+
+		updateAnimations();
+	
+		if (!_vm->isSoundPlaying(0x10925))
+			_vm->playSound(0x10925, true);
+	
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
+				_vm->updatePlatypusIdleSequence();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[1] && !_platypusScared) {
+				_vm->_timers[1] = _vm->getRandom(40) + 20;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFPlatypus) && !_platypusHypnotized)
+					_nextPlatSequenceId = 450;
+			}
+			if (!_vm->_timers[6]) {
+				_vm->_timers[6] = _vm->getRandom(20) + 30;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextFrogSequenceId == -1) {
+					if (_vm->getRandom(5) == 1)
+						_nextFrogSequenceId = 0x1C6;
+					else
+						_nextFrogSequenceId = 0x1C7;
+				}
+			}
+			if (!_vm->_timers[4]) {
+				// Update bird animation
+				_vm->_timers[4] = _vm->getRandom(100) + 300;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0)
+					_vm->_gameSys->insertSequence(_vm->getRandom(2) != 0 ? 0x1C8 : 0x1C3, 253, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			if (!_vm->_timers[5]) {
+				_vm->_timers[5] = _vm->getRandom(100) + 200;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0) {
+					_vm->_gameSys->setAnimation(0x1C5, 253, 4);
+					_vm->_gameSys->insertSequence(0x1C5, 253, 0, 0, kSeqNone, 0, 0, 0);
+				}
+			}
+			_vm->playSoundC();
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[5] = _vm->getRandom(100) + 200;
+			_vm->_timers[4] = _vm->getRandom(100) + 300;
+			_vm->_timers[6] = _vm->getRandom(20) + 30;
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene03::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS03LeaveScene:
+			_vm->_sceneDone = true;
+			break;
+		case kAS03FreePlatypus:
+			_nextPlatSequenceId = 0x1BC;
+			break;
+		case kAS03FreePlatypusDone:
+			_vm->_gnapActionStatus = -1;
+			_vm->_platX = 6;
+			_vm->_platY = 6;
+			_vm->_platypusFacing = kDirUnk4;
+			_vm->_platypusId = 120;
+			_vm->_gameSys->insertSequence(0x107CA, _vm->_platypusId, 0x1BC, 99,
+				kSeqSyncWait, 0, 75 * _vm->_platX - _vm->_platGridX, 48 * _vm->_platY - _vm->_platGridY);
+			_vm->_gameSys->insertSequence(0x1B7, 99, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 1;
+			_vm->_platypusSequenceId = 0x7CA;
+			_vm->setFlag(kGFPlatypus);
+			_nextPlatSequenceId = -1;
+			updateHotspots();
+			break;
+		case kAS03HypnotizePlat:
+			_vm->playGnapBrainPulsating(0, 0);
+			_vm->addFullScreenSprite(0x106, 255);
+			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
+			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->removeFullScreenSprite();
+			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BA, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_platypusSequenceId = 0x1BA;
+			_vm->_gnapActionStatus = -1;
+			_platypusHypnotized = true;
+			updateHotspots();
+			break;
+		case kAS03HypnotizeScaredPlat:
+			_vm->playGnapBrainPulsating(0, 0);
+			_vm->_gameSys->insertSequence(0x1BF, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1BF, 99, 1);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->addFullScreenSprite(0x106, 255);
+			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
+			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
+			while (_vm->_gameSys->getAnimationStatus(1) != 2)
+				_vm->gameUpdateTick();
+			_vm->removeFullScreenSprite();
+			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BA, 99, 447, 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_platypusSequenceId = 0x1BA;
+			_vm->_gnapActionStatus = -1;
+			_platypusHypnotized = true;
+			updateHotspots();
+			break;
+		case kAS03GrabPlatypus:
+			_nextPlatSequenceId = 0x1BD;
+			_platypusHypnotized = false;
+			break;
+		case kAS03GrabScaredPlatypus:
+			_nextPlatSequenceId = 0x1C0;
+			_platypusHypnotized = false;
+			break;
+		case kAS03GrabCreek:
+			_vm->_gameSys->insertSequence(0x1B4, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1B4, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x1B4;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS03GrabCreekDone;
+			break;
+		default:
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
+		if (_nextPlatSequenceId == 0x1BD || _nextPlatSequenceId == 0x1C0) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_platypusScared = true;
+			_vm->_gameSys->insertSequence(0x1B5, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(_nextPlatSequenceId, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0x1B5;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapIdleFacing = kDirNone;
+			_vm->_platypusSequenceId = _nextPlatSequenceId;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(_nextPlatSequenceId, 99, 1);
+			_nextPlatSequenceId = -1;
+			_vm->_gnapActionStatus = -1;
+		} else if (_nextPlatSequenceId == 0x1BC) {
+			_vm->_gnapX = 3;
+			_vm->_gnapY = 6;
+			_vm->_gameSys->insertSequence(0x1B6, 120, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x1BC, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x1BC, 99, 0);
+			_vm->_gnapId = 20 * _vm->_gnapY;
+			_vm->_gnapSequenceId = 0x1B6;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapIdleFacing = kDirNone;
+			_vm->_gnapActionStatus = kAS03FreePlatypusDone;
+			_nextPlatSequenceId = -1;
+		} else if (_nextPlatSequenceId == 0x1C2 && !_platypusScared) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->insertSequence(0x1C2, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceId = 0x1C2;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(0x1C2, 99, 1);
+			_nextPlatSequenceId = -1;
+		} else if (_nextPlatSequenceId == -1 && _platypusScared && !_platypusHypnotized) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->setAnimation(0x1BE, 99, 1);
+			_vm->_gameSys->insertSequence(0x1BE, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceId = 0x1BE;
+			_vm->_platypusSequenceDatNum = 0;
+			_nextPlatSequenceId = -1;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextFrogSequenceId != -1) {
+		_vm->_gameSys->setAnimation(_nextFrogSequenceId, 253, 2);
+		_vm->_gameSys->insertSequence(_nextFrogSequenceId, 253, _currFrogSequenceId, 253, kSeqSyncWait, 0, 0, 0);
+		_currFrogSequenceId = _nextFrogSequenceId;
+		_nextFrogSequenceId = -1;
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(5) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 5);
+		_vm->invAdd(kItemGrass);
+		_vm->setGrabCursorSprite(kItemGrass);
+		_vm->setFlag(kGFGrassTaken);
+		updateHotspots();
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS04Platypus	= 0,
+	kHS04Twig		= 1,
+	kHS04Dog		= 2,
+	kHS04Axe		= 3,
+	kHS04Door		= 4,
+	kHS04ExitTruck	= 5,
+	kHS04Device		= 6,
+	kHS04Window		= 7,
+	kHS04ExitBarn	= 8,
+	kHS04WalkArea1	= 9,
+	kHS04WalkArea2	= 10
+};
+
+enum {
+	kAS04OpenDoor			= 1,
+	kAS04GetKeyFirst		= 2,
+	kAS04GetKeyAnother		= 3,
+	kAS04LeaveScene			= 4,
+	kAS04GetKeyFirstDone	= 6,
+	kAS04GetKeyFirst2		= 7,
+	kAS04GetKeyAnother2		= 8,
+	kAS04GetKeyAnotherDone	= 9,
+	kAS04OpenDoorDone		= 10,
+	kAS04GrabDog			= 12,
+	kAS04GrabAxe			= 13
+};
+
+Scene04::Scene04(GnapEngine *vm) : Scene(vm) {
+	_dogIdCtr = 0;
+	_triedWindow = false;
+	_nextDogSequenceId = -1;
+	_currDogSequenceId = -1;
+}
+
+int Scene04::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 1);
+	_vm->_gameSys->setAnimation(0, 0, 2);
+	return 0x214;
+}
+
+void Scene04::updateHotspots() {
+	_vm->setHotspot(kHS04Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS04Twig, 690, 394, 769, 452, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
+	_vm->setHotspot(kHS04Dog, 550, 442, 680, 552, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 8);
+	_vm->setHotspot(kHS04Axe, 574, 342, 680, 412, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 7);
+	_vm->setHotspot(kHS04Door, 300, 244, 386, 410, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 7);
+	_vm->setHotspot(kHS04ExitTruck, 226, 580, 688, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 9);
+	_vm->setHotspot(kHS04Window, 121, 295, 237, 342, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
+	_vm->setHotspot(kHS04ExitBarn, 585, 154, 800, 276, SF_EXIT_U_CURSOR, 10, 8);
+	_vm->setHotspot(kHS04WalkArea1, 0, 0, 562, 461);
+	_vm->setHotspot(kHS04WalkArea2, 562, 0, 800, 500);
+	_vm->setDeviceHotspot(kHS04Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS04Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	if (_vm->isFlag(kGFTwigTaken))
+		_vm->_hotspots[kHS04Twig]._flags = SF_WALKABLE | SF_DISABLED;
+	if (_vm->isFlag(kGFPlatypusTalkingToAssistant) || _vm->_cursorValue == 1)
+		_vm->_hotspots[kHS04Axe]._flags = SF_DISABLED;
+	_vm->_hotspotsCount = 11;
+}
+
+void Scene04::run() {
+	_vm->playSound(0x1091C, true);
+	_vm->startSoundTimerC(4);
+
+	_vm->_gameSys->insertSequence(0x210, 139 - _dogIdCtr, 0, 0, kSeqNone, 0, 0, 0);
+
+	_currDogSequenceId = 0x210;
+	_nextDogSequenceId = -1;
+	
+	_vm->_gameSys->setAnimation(0x210, 139 - _dogIdCtr, 3);
+	_dogIdCtr = (_dogIdCtr + 1) % 2;
+	_vm->_timers[6] = _vm->getRandom(20) + 60;
+	_vm->_timers[5] = _vm->getRandom(150) + 300;
+	_vm->_timers[7] = _vm->getRandom(150) + 200;
+	_vm->_timers[8] = _vm->getRandom(150) + 400;
+
+	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant) && _vm->_cursorValue == 4)
+		_vm->_gameSys->insertSequence(0x212, 100, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (!_vm->isFlag(kGFTwigTaken))
+		_vm->_gameSys->insertSequence(0x1FE, 100, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->queueInsertDeviceIcon();
+	
+	if (_vm->isFlag(kGFPlatyPussDisguised)) {
+		_vm->_timers[3] = 300;
+		// TODO setCursor((LPCSTR)IDC_WAIT);
+		_vm->setGrabCursorSprite(kItemKeys);
+		_vm->_gnapX = 4;
+		_vm->_gnapY = 7;
+		_vm->_gnapId = 140;
+		_vm->_platX = 6;
+		_vm->_platY = 7;
+		_vm->_platypusId = 141;
+		_vm->_gameSys->insertSequence(0x107B5, 140, 0, 0, kSeqNone, 0, 300 - _vm->_gnapGridX, 336 - _vm->_gnapGridY);
+		_vm->_gameSys->insertSequence(0x20C, 141, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->_gameSys->insertSequence(0x208, 121, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->_gameSys->insertSequence(0x209, 121, 0x208, 121, kSeqSyncWait, 0, 0, 0);
+		_vm->endSceneInit();
+		_vm->invRemove(kItemDisguise);
+		_vm->invAdd(kItemKeys);
+		_vm->setFlag(kGFKeysTaken);
+		_vm->clearFlag(kGFPlatyPussDisguised);
+		_vm->_platypusSequenceId = 0x20C;
+		_vm->_platypusSequenceDatNum = 0;
+		_vm->_platypusFacing = kDirBottomRight;
+		_vm->_gnapSequenceId = 0x7B5;
+		_vm->_gnapSequenceDatNum = 1;
+		_vm->_gameSys->waitForUpdate();
+	} else {
+		_vm->_gameSys->insertSequence(0x209, 121, 0, 0, kSeqNone, 0, 0, 0);
+		if (_vm->_prevSceneNum == 2) {
+			_vm->initGnapPos(5, 11, kDirUpRight);
+			if (_vm->isFlag(kGFPlatypus))
+				_vm->initPlatypusPos(6, 11, kDirUpLeft);
+			_vm->endSceneInit();
+			if (_vm->isFlag(kGFPlatypus))
+				_vm->platypusWalkTo(5, 8, -1, 0x107C2, 1);
+			_vm->gnapWalkTo(6, 9, -1, 0x107BA, 1);
+		} else if (_vm->_prevSceneNum == 38) {
+			_vm->initGnapPos(5, 7, kDirBottomRight);
+			_vm->initPlatypusPos(4, 7, kDirNone);
+			_vm->endSceneInit();
+		} else {
+			_vm->initGnapPos(12, 9, kDirBottomRight);
+			if (_vm->isFlag(kGFPlatypus))
+				_vm->initPlatypusPos(12, 8, kDirNone);
+			_vm->endSceneInit();
+			if (_vm->isFlag(kGFPlatypus))
+				_vm->platypusWalkTo(9, 8, -1, 0x107C2, 1);
+		_vm->gnapWalkTo(9, 9, -1, 0x107BA, 1);
+		}
+	}
+	
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+		
+		_vm->testWalk(0, 4, -1, -1, -1, -1);
+	
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS04Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+
+		case kHS04Platypus:
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						if (_vm->_cursorValue == 4)
+							_vm->gnapKissPlatypus(0);
+						else
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04Twig:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						break;
+					case GRAB_CURSOR:
+						_vm->playGnapPullOutDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						_vm->playGnapUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						_vm->_gameSys->insertSequence(0x1FD, 100, 510, 100, kSeqSyncWait, 0, 0, 0);
+						_vm->_gameSys->setAnimation(0x1FD, 100, 2);
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04Axe:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 9, 5);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS04GrabAxe;
+						_vm->setFlag(kGFPlatypusTalkingToAssistant);
+						updateHotspots();
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04Dog:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 9, 7);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->gnapWalkTo(_vm->_gnapX, _vm->_gnapY, 0, -1, 1)) {
+							_vm->playGnapMoan2(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+							_nextDogSequenceId = 0x20F;
+						}
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
+							_vm->_gnapActionStatus = kAS04GrabDog;
+						break;
+					case TALK_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						if (_vm->gnapWalkTo(_vm->_gnapX, _vm->_gnapY, 0, -1, 1)) {
+							_vm->playGnapBrainPulsating(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
+							_nextDogSequenceId = 0x20E;
+						}
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04Door:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 4, 3);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapScratchingHead(4, 3);
+						break;
+					case GRAB_CURSOR:
+						if (_vm->_cursorValue == 1) {
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1);
+							_vm->_gnapActionStatus = kAS04OpenDoor;
+							_vm->_timers[5] = 300;
+							_vm->_gnapIdleFacing = kDirUpLeft;
+						} else {
+							_vm->_isLeavingScene = true;
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1);
+							_vm->_gnapActionStatus = kAS04LeaveScene;
+							_vm->_newSceneNum = 38;
+						}
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04ExitTruck:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, 0x107AE, 1);
+				_vm->_gnapActionStatus = kAS04LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, -1, 0x107C7, 1);
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 2;
+				else
+					_vm->_newSceneNum = 33;
+			}
+			break;
+		
+		case kHS04Window:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
+				} else if (_vm->isFlag(kGFKeysTaken)) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, _vm->getGnapSequenceId(gskIdle, 10, 2) | 0x10000, 1)) {
+							if (_triedWindow) {
+								_vm->_gnapActionStatus = kAS04GetKeyAnother;
+							} else {
+								_vm->_gnapActionStatus = kAS04GetKeyFirst;
+								_triedWindow = true;
+							}
+						}
+						break;
+					case GRAB_CURSOR:
+						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y);
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+		
+		case kHS04ExitBarn:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1);
+				_vm->_gnapActionStatus = kAS04LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y + 1, -1, 0x107C1, 1);
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 5;
+				else
+					_vm->_newSceneNum = 35;
+			}
+			break;
+		
+		case kHS04WalkArea1:
+		case kHS04WalkArea2:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+			
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+			      	
+		}
+	
+		updateAnimations();
+	
+		if (!_vm->isSoundPlaying(0x1091C))
+			_vm->playSound(0x1091C, true);
+	
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
+				_vm->platypusSub426234();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence2();
+			if (!_vm->_timers[5]) {
+				_vm->_timers[5] = _vm->getRandom(150) + 300;
+				if (_vm->_gnapActionStatus < 0)
+					_vm->_gameSys->insertSequence(0x20D, 79, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			if (!_vm->_timers[7]) {
+				_vm->_timers[7] = _vm->getRandom(150) + 200;
+				_vm->_gameSys->insertSequence(0x1FC, 59, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			if (!_vm->_timers[6]) {
+				_vm->_timers[6] = _vm->getRandom(20) + 60;
+				if (_nextDogSequenceId == -1)
+					_nextDogSequenceId = 0x210;
+			}
+			if (!_vm->_timers[8]) {
+				_vm->_timers[8] = _vm->getRandom(150) + 400;
+				_vm->_gameSys->insertSequence(0x213, 20, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			_vm->playSoundC();
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene04::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS04LeaveScene:
+			_vm->_sceneDone = true;
+			break;
+		case kAS04OpenDoor:
+			_vm->_gameSys->insertSequence(0x205, _vm->_gnapId, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x207, 121, 521, 121, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapX = 6;
+			_vm->_gnapY = 7;
+			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
+				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
+				kSeqSyncWait, _vm->getSequenceTotalDuration(0x205) - 1, 450 - _vm->_gnapGridX, 336 - _vm->_gnapGridY);
+			_vm->_gameSys->setAnimation(0x107B5, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x7B5;
+			_vm->_gnapSequenceDatNum = 1;
+			_vm->_gnapActionStatus = kAS04OpenDoorDone;
+			break;
+		case kAS04OpenDoorDone:
+			_vm->_gameSys->insertSequence(0x209, 121, 0x207, 121, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS04GetKeyFirst:
+			_vm->_gameSys->insertSequence(0x204, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x204, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x204;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS04GetKeyFirst2;
+			break;
+		case kAS04GetKeyFirst2:
+			_vm->_gameSys->insertSequence(0x206, 255, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x1FF, 256, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x20B, 256, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x20B, 256, 0);
+			_vm->_gnapSequenceId = 0x206;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS04GetKeyFirstDone;
+			break;
+		case kAS04GetKeyFirstDone:
+			_vm->_gameSys->requestRemoveSequence(0x1FF, 256);
+			_vm->_gameSys->requestRemoveSequence(0x20B, 256);
+			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
+				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), 255,
+				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+			_vm->_gnapIdleFacing = kDirBottomRight;
+			_vm->_gnapSequenceId = 0x7B5;
+			_vm->_gnapSequenceDatNum = 1;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS04GetKeyAnother:
+			_vm->_gameSys->insertSequence(0x202, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x202, _vm->_gnapId, 0);
+			_vm->_gnapSequenceId = 0x202;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS04GetKeyAnother2;
+			break;
+		case kAS04GetKeyAnother2:
+			_vm->_gameSys->insertSequence(0x203, 255, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x1FF, 256, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x20A, 256, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0x20A, 256, 0);
+			_vm->_gnapSequenceId = 0x203;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS04GetKeyAnotherDone;
+			break;
+		case kAS04GetKeyAnotherDone:
+			_vm->_gameSys->removeSequence(0x1FF, 256, true);
+			_vm->_gameSys->removeSequence(0x20A, 256, true);
+			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
+				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), 255,
+				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+			_vm->_gnapSequenceId = 0x7B5;
+			_vm->_gnapSequenceDatNum = 1;
+			_vm->_gnapIdleFacing = kDirBottomRight;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS04GrabDog:
+			_nextDogSequenceId = 0x201;
+			break;
+		case kAS04GrabAxe:
+			_vm->_gameSys->insertSequence(0x211, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->requestRemoveSequence(0x212, 100);
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapSequenceId = 0x211;
+			_vm->_gnapActionStatus = -1;
+			break;
+		default:
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 2);
+		_vm->invAdd(kItemTwig);
+		_vm->setGrabCursorSprite(kItemTwig);
+		_vm->setFlag(kGFTwigTaken);
+		updateHotspots();
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+		if (_nextDogSequenceId == 0x201) {
+			_vm->_gameSys->insertSequence(_nextDogSequenceId, 139 - _dogIdCtr,
+				_currDogSequenceId, 139 - (_dogIdCtr + 1) % 2,
+				kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x200, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(_nextDogSequenceId, 139 - _dogIdCtr, 3);
+			_dogIdCtr = (_dogIdCtr + 1) % 2;
+			_currDogSequenceId = 0x201;
+			_vm->_gnapSequenceId = 0x200;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = -1;
+			_vm->_timers[6] = _vm->getRandom(20) + 60;
+			_nextDogSequenceId = -1;
+		} else if (_nextDogSequenceId != -1) {
+			_vm->_gameSys->insertSequence(_nextDogSequenceId, 139 - _dogIdCtr,
+				_currDogSequenceId, 139 - (_dogIdCtr + 1) % 2,
+				kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(_nextDogSequenceId, 139 - _dogIdCtr, 3);
+			_dogIdCtr = (_dogIdCtr + 1) % 2;
+			_currDogSequenceId = _nextDogSequenceId;
+			_nextDogSequenceId = -1;
+		}
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS05Platypus	= 0,
+	kHS05Haystack	= 1,
+	kHS05Padlock	= 2,
+	kHS05Ladder		= 3,
+	kHS05ExitHouse	= 4,
+	kHS05Chicken	= 5,
+	kHS05Device		= 6,
+	kHS05WalkArea1	= 7,
+	kHS05WalkArea2	= 8,
+	kHS05WalkArea3	= 9
+};
+
+enum {
+	kAS05PlatSearchHaystack	= 0,
+	kAS05TryPickPadlock		= 1,
+	kAS05PickPadlock		= 2,
+	kAS05TalkChicken		= 3,
+	kAS05GrabChicken		= 4,
+	kAS05GrabLadder			= 5,
+	kAS05EnterBarn			= 6,
+	kAS05UseTwigWithChicken	= 11,
+	kAS05LeaveScene			= 12
+};
+
+Scene05::Scene05(GnapEngine *vm) : Scene(vm) {
+	_nextChickenSequenceId = -1;
+	_currChickenSequenceId = -1;
+}
+
+int Scene05::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 1);
+	_vm->_gameSys->setAnimation(0, 0, 3);
+	return _vm->isFlag(kGFBarnPadlockOpen) ? 0x151 : 0x150;
+}
+
+void Scene05::updateHotspots() {
+	_vm->setHotspot(kHS05Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS05Haystack, 236, 366, 372, 442, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 7);
+	_vm->setHotspot(kHS05Padlock, 386, 230, 626, 481, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 7);
+	_vm->setHotspot(kHS05Ladder, 108, 222, 207, 444, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
+	_vm->setHotspot(kHS05ExitHouse, 0, 395, 20, 600, SF_EXIT_L_CURSOR | SF_WALKABLE, 0, 8);
+	_vm->setHotspot(kHS05Chicken, 612, 462, 722, 564, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 7, 8);
+	_vm->setHotspot(kHS05WalkArea1, 104, 0, 421, 480);
+	_vm->setHotspot(kHS05WalkArea2, 422, 0, 800, 487);
+	_vm->setHotspot(kHS05WalkArea3, 0, 0, 104, 499);
+	_vm->setDeviceHotspot(kHS05Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS05Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
+	if (_vm->isFlag(kGFBarnPadlockOpen))
+		_vm->_hotspots[kHS05Padlock]._flags = SF_EXIT_U_CURSOR;
+	_vm->_hotspotsCount = 10;
+}
+
+void Scene05::run() {
+	_vm->playSound(0x1091C, true);
+	_vm->startSoundTimerC(7);
+	
+	_currChickenSequenceId = 0x142;
+	_vm->_gameSys->setAnimation(0x142, 100, 3);
+	_vm->_gameSys->insertSequence(0x142, 100, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_nextChickenSequenceId = -1;
+
+	_vm->_timers[5] = _vm->getRandom(10) + 30;
+	_vm->_timers[6] = _vm->getRandom(150) + 300;
+
+	if (_vm->isFlag(kGFBarnPadlockOpen))
+		_vm->_gameSys->insertSequence(0x14A, 141, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->queueInsertDeviceIcon();
+	
+	if (_vm->_prevSceneNum != 6 && _vm->_prevSceneNum != 36) {
+		_vm->initGnapPos(-1, 8, kDirBottomRight);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(-1, 9, kDirNone);
+		_vm->endSceneInit();
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->platypusWalkTo(2, 8, -1, 0x107C2, 1);
+		_vm->gnapWalkTo(2, 9, -1, 0x107B9, 1);
+	} else {
+		_vm->initGnapPos(6, 8, kDirBottomRight);
+		if (_vm->isFlag(kGFPlatypus))
+			_vm->initPlatypusPos(7, 9, kDirNone);
+		_vm->endSceneInit();
+	}
+	
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+	
+		_vm->testWalk(0, 12, -1, -1, -1, -1);
+	
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS05Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+
+		case kHS05Platypus:
+			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapKissPlatypus(0);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS05Haystack:
+			if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
+				} else if (_vm->isFlag(kGFNeedleTaken)) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1);
+						break;
+					case GRAB_CURSOR:
+					case TALK_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					case PLAT_CURSOR:
+						if (_vm->isFlag(kGFPlatypus)) {
+							_vm->gnapUseDeviceOnPlatypuss();
+							if (_vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 1, 0x107C2, 1)) {
+								_vm->_platypusActionStatus = kAS05PlatSearchHaystack;
+								_vm->_platypusFacing = kDirUnk4;
+							}
+							if (_vm->_gnapX == 4 && (_vm->_gnapY == 8 || _vm->_gnapY == 7))
+								_vm->gnapWalkStep();
+							_vm->playGnapIdle(_vm->_platX, _vm->_platY);
+						}
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS05Chicken:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemTwig) {
+					_vm->_gnapIdleFacing = kDirUpRight;
+					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1,
+						0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+					_vm->_gnapActionStatus = kAS05UseTwigWithChicken;
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(9, 7);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS05GrabChicken;
+						break;
+					case TALK_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS05TalkChicken;
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS05Ladder:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 5);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapMoan2(2, 4);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirBottomLeft;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS05GrabLadder;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS05Padlock:
+			if (_vm->isFlag(kGFBarnPadlockOpen)) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x - 1, _vm->_hotspotsWalkPos[2].y + 1, 0, -1, 1);
+				_vm->_gnapActionStatus = kAS05EnterBarn;
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 6;
+				else
+					_vm->_newSceneNum = 36;
+			} else if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemNeedle) {
+					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0,
+						_vm->getGnapSequenceId(gskIdle, _vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y) | 0x10000, 1))
+						_vm->_gnapActionStatus = kAS05PickPadlock;
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 7, 4);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(7, 4);
+						break;
+					case GRAB_CURSOR:
+						_vm->_gnapIdleFacing = kDirUpRight;
+						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y,
+							0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
+						_vm->_gnapActionStatus = kAS05TryPickPadlock;
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS05ExitHouse:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AF, 1);
+				_vm->_gnapActionStatus = kAS05LeaveScene;
+				if (_vm->isFlag(kGFPlatypus))
+					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y + 1, -1, 0x107C7, 1);
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 4;
+				else
+					_vm->_newSceneNum = 37;
+			}
+			break;
+
+		case kHS05WalkArea1:
+		case kHS05WalkArea2:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+			
+		case kHS05WalkArea3:
+			// Nothing
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+		
+		}
+	
+		updateAnimations();
+	
+		if (!_vm->isSoundPlaying(0x1091C))
+			_vm->playSound(0x1091C, true);
+	
+		if (!_vm->_isLeavingScene) {
+			if (_vm->isFlag(kGFPlatypus))
+				_vm->updatePlatypusIdleSequence();
+			_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[5]) {
+				_vm->_timers[5] = _vm->getRandom(20) + 30;
+				if (_vm->_gnapActionStatus != kAS05TalkChicken && _nextChickenSequenceId == -1) {
+					if (_vm->getRandom(4) != 0)
+						_nextChickenSequenceId = 0x142;
+					else
+						_nextChickenSequenceId = 0x143;
+				}
+			}
+			if (!_vm->_timers[6]) {
+				_vm->_timers[6] = _vm->getRandom(150) + 300;
+				if (_vm->_gnapActionStatus < 0)
+					_vm->_gameSys->insertSequence(0x149, 39, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			_vm->playSoundC();
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[5] = _vm->getRandom(20) + 30;
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene05::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS05LeaveScene:
+			_vm->_sceneDone = true;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS05TryPickPadlock:
+			_vm->_gameSys->insertSequence(0x148, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0x148;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS05PickPadlock:
+			_vm->_gameSys->setAnimation(0x147, _vm->_gnapId, 0);
+			_vm->_gameSys->insertSequence(0x147, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0x147;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->setFlag(kGFBarnPadlockOpen);
+			_vm->setFlag(kGFSceneFlag1);
+			_vm->setGrabCursorSprite(-1);
+			_vm->_newSceneNum = 6;
+			_vm->_timers[2] = 100;
+			_vm->invRemove(kItemNeedle);
+			_vm->_gnapActionStatus = kAS05LeaveScene;
+			break;
+		case kAS05TalkChicken:
+			_nextChickenSequenceId = 0x144;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS05GrabChicken:
+			_nextChickenSequenceId = 0x14B;
+			break;
+		case kAS05GrabLadder:
+			while (_vm->_gameSys->isSequenceActive(0x149, 39))
+				_vm->gameUpdateTick();
+			_vm->_gameSys->insertSequence(0x14E, _vm->_gnapId + 1, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x14D, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0x14D;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_timers[2] = 200;
+			_vm->_timers[6] = 300;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS05EnterBarn:
+			_vm->_gameSys->insertSequence(0x107B1, 1,
+				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
+				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+			_vm->_gameSys->setAnimation(0x107B1, 1, 0);
+			_vm->_gnapActionStatus = kAS05LeaveScene;
+			break;
+		case kAS05UseTwigWithChicken:
+			_vm->playGnapShowItem(5, 0, 0);
+			_nextChickenSequenceId = 0x14F;
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
+		if (_vm->_platypusSequenceId == 0x146) {
+			_vm->_platX = 4;
+			_vm->_platY = 8;
+			_vm->_gameSys->insertSequence(0x107C1, 160, 0x146, 256, kSeqSyncWait, 0, 300 - _vm->_platGridX, 384 - _vm->_platGridY);
+			_vm->_platypusSequenceId = 0x7C1;
+			_vm->_platypusSequenceDatNum = 1;
+			_vm->_platypusId = 20 * _vm->_platY;
+			_vm->invAdd(kItemNeedle);
+			_vm->setFlag(kGFNeedleTaken);
+			_vm->setGrabCursorSprite(kItemNeedle);
+			_vm->showCursor();
+			_vm->_timers[1] = 30;
+			_vm->_platypusActionStatus = -1;
+		}
+		if (_vm->_platypusActionStatus == kAS05PlatSearchHaystack) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->_gameSys->insertSequence(0x145, _vm->_platypusId, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x146, 256, 0x145, _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
+			_vm->hideCursor();
+			_vm->setGrabCursorSprite(-1);
+			_vm->_platypusSequenceId = 0x146;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->setAnimation(0x146, 256, 1);
+			_vm->_timers[1] = 300;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+		if (_nextChickenSequenceId == 0x14B) {
+			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 100, 3);
+			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 100, _currChickenSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x14C, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapSequenceId = 0x14C;
+			_currChickenSequenceId = _nextChickenSequenceId;
+			_nextChickenSequenceId = -1;
+			_vm->_gnapActionStatus = -1;
+		} else if (_nextChickenSequenceId != -1) {
+			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 100, 3);
+			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 100, _currChickenSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+			_currChickenSequenceId = _nextChickenSequenceId;
+			_nextChickenSequenceId = -1;
+		}
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS06Platypus			= 0,
+	kHS06Gas				= 1,
+	kHS06Ladder				= 2,
+	kHS06Horse				= 3,
+	kHS06ExitOutsideBarn	= 4,
+	kHS06Device				= 5,
+	kHS06WalkArea1			= 6,
+	kHS06WalkArea2			= 7,
+	kHS06WalkArea3			= 8,
+	kHS06WalkArea4			= 9,
+	kHS06WalkArea5			= 10
+};
+
+enum {
+	kAS06TryToGetGas			= 0,
+	kAS06TryToClimbLadder		= 1,
+	kAS06TryToClimbLadderDone	= 2,
+	kAS06TalkToHorse			= 3,
+	kAS06UseTwigOnHorse			= 4,
+	kAS06LeaveScene				= 5
+};
+
+Scene06::Scene06(GnapEngine *vm) : Scene(vm) {
+	_horseTurnedBack = false;;
+	_nextPlatSequenceId = -1;
+	_nextHorseSequenceId = -1;
+	_currHorseSequenceId = -1;
+}
+
+int Scene06::init() {
+	_vm->_gameSys->setAnimation(0, 0, 0);
+	_vm->_gameSys->setAnimation(0, 0, 1);
+	_vm->_gameSys->setAnimation(0, 0, 2);
+	if (_vm->isFlag(kGFSceneFlag1)) {
+		_vm->playSound(0x11B, false);
+		_vm->clearFlag(kGFSceneFlag1);
+	}
+	return 0x101;
+}
+
+void Scene06::updateHotspots() {
+	_vm->setHotspot(kHS06Platypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS06Gas, 300, 120, 440, 232, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
+	_vm->setHotspot(kHS06Ladder, 497, 222, 614, 492, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 8);
+	_vm->setHotspot(kHS06Horse, 90, 226, 259, 376, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
+	_vm->setHotspot(kHS06ExitOutsideBarn, 226, 580, 688, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 10);
+	_vm->setHotspot(kHS06WalkArea1, 0, 0, 200, 515);
+	_vm->setHotspot(kHS06WalkArea2, 200, 0, 285, 499);
+	_vm->setHotspot(kHS06WalkArea3, 688, 0, 800, 499);
+	_vm->setHotspot(kHS06WalkArea4, 475, 469, 800, 505);
+	_vm->setHotspot(kHS06WalkArea5, 0, 0, 800, 504);
+	_vm->setDeviceHotspot(kHS06Device, -1, -1, -1, -1);
+    if (_vm->isFlag(kGFGasTaken)) 
+    	_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
+	if (_vm->_cursorValue == 4) {
+		_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
+		_vm->_hotspots[kHS06Gas]._flags = SF_DISABLED;
+	}
+	_vm->_hotspotsCount = 11;
+}
+
+void Scene06::run() {
+	bool triedDeviceOnGas = false;
+	
+	_vm->startSoundTimerC(7);
+
+	_horseTurnedBack = false;
+	_vm->_gameSys->insertSequence(0xF1, 120, 0, 0, kSeqNone, 0, 0, 0);
+
+	_currHorseSequenceId = 0xF1;
+	_nextHorseSequenceId = -1;
+
+	_vm->_gameSys->setAnimation(0xF1, 120, 2);
+	_vm->_timers[4] = _vm->getRandom(40) + 25;
+
+	if (_vm->isFlag(kGFUnk04))
+		_vm->_gameSys->insertSequence(0xF7, 20, 0, 0, kSeqNone, 0, 0, 0);
+	else
+		_vm->_gameSys->insertSequence(0xF8, 20, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (!_vm->isFlag(kGFGasTaken) && _vm->_cursorValue != 4)
+		_vm->_gameSys->insertSequence(0xFE, 20, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->queueInsertDeviceIcon();
+	
+	_vm->initGnapPos(5, 12, kDirBottomRight);
+	_vm->initPlatypusPos(6, 12, kDirNone);
+	_vm->endSceneInit();
+	
+	_vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
+	_vm->gnapWalkTo(5, 8, -1, 0x107B9, 1);
+	
+	while (!_vm->_sceneDone) {
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+		
+		_vm->testWalk(0, 5, -1, -1, -1, -1);
+	
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS06Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+			}
+			break;
+		
+		case kHS06Platypus:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
+					_vm->gnapUseDisguiseOnPlatypus();
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapImpossible(0, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						if (_vm->isFlag(kGFKeysTaken))
+							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+						else
+							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+						break;
+					case GRAB_CURSOR:
+						_vm->gnapKissPlatypus(0);
+						break;
+					case TALK_CURSOR:
+						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+						break;
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS06Gas:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 5, 0);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(5, 0);
+						break;
+					case GRAB_CURSOR:
+						if (_vm->isFlag(kGFUnk04)) {
+							_vm->playGnapImpossible(0, 0);
+						} else if (triedDeviceOnGas) {
+							_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107BC, 1);
+							_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
+							_vm->_gnapActionStatus = kAS06TryToGetGas;
+						} else {
+							triedDeviceOnGas = true;
+							_vm->playGnapPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
+						}
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						if (_vm->isFlag(kGFUnk04))
+							_vm->playGnapImpossible(0, 0);
+						else
+							_vm->playGnapScratchingHead(5, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS06Ladder:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 4);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(8, 4);
+						break;
+					case GRAB_CURSOR:
+						if (_vm->isFlag(kGFGasTaken))
+							_vm->playGnapImpossible(0, 0);
+						else {
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107BB, 1);
+							_vm->_gnapActionStatus = kAS06TryToClimbLadder;
+							_vm->setFlag(kGFGasTaken);
+						}
+						break;
+					case TALK_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS06Horse:
+			if (_vm->_gnapActionStatus < 0) {
+				if (_vm->_grabCursorSpriteIndex == kItemTwig && _horseTurnedBack) {
+					_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
+					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, 0x107BC, 1);
+					_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
+					_vm->_gnapIdleFacing = kDirUpLeft;
+					_vm->platypusWalkTo(6, 8, 1, 0x107C2, 1);
+					_vm->_platypusFacing = kDirNone;
+					_vm->_gnapActionStatus = kAS06UseTwigOnHorse;
+					_vm->setGrabCursorSprite(-1);
+				} else if (_vm->_grabCursorSpriteIndex >= 0) {
+					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 3, 2);
+				} else {
+					switch (_vm->_verbCursor) {
+					case LOOK_CURSOR:
+						_vm->playGnapScratchingHead(3, 2);
+						break;
+					case TALK_CURSOR:
+						if (_horseTurnedBack) {
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 3, 2) | 0x10000, 1);
+						} else {
+							_vm->_gnapIdleFacing = kDirBottomLeft;
+							_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
+							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+							_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
+							_vm->_gnapActionStatus = kAS06TalkToHorse;
+						}
+						break;
+					case GRAB_CURSOR:
+					case PLAT_CURSOR:
+						_vm->playGnapImpossible(0, 0);
+						break;
+					}
+				}
+			}
+			break;
+
+		case kHS06ExitOutsideBarn:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->_isLeavingScene = true;
+				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AE, 1);
+				_vm->_gnapActionStatus = kAS06LeaveScene;
+				if (_vm->_cursorValue == 1)
+					_vm->_newSceneNum = 5;
+				else
+					_vm->_newSceneNum = 35;
+			}
+			break;
+
+		case kHS06WalkArea1:
+		case kHS06WalkArea2:
+		case kHS06WalkArea3:
+		case kHS06WalkArea4:
+		case kHS06WalkArea5:
+			if (_vm->_gnapActionStatus < 0)
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+
+		}
+
+		updateAnimations();
+	
+		if (!_vm->_isLeavingScene) {
+			if (_vm->_platypusActionStatus < 0)
+				_vm->updatePlatypusIdleSequence();
+			if (_vm->_gnapActionStatus < 0)
+				_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[4]) {
+				_vm->_timers[4] = _vm->getRandom(40) + 25;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextHorseSequenceId == -1) {
+					if (_horseTurnedBack) {
+						_nextHorseSequenceId = 0xF5;
+					} else {
+						switch (_vm->getRandom(5)) {
+						case 0:
+						case 1:
+						case 2:
+							_nextHorseSequenceId = 0xF1;
+							break;
+						case 3:
+							_nextHorseSequenceId = 0xF3;
+							break;
+						case 4:
+							_nextHorseSequenceId = 0xF4;
+							break;
+						}
+					}
+				}
+			}
+			_vm->playSoundC();
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene06::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS06LeaveScene:
+			_vm->_sceneDone = true;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS06TryToGetGas:
+			_vm->_gameSys->insertSequence(0xFC, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0xFC;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS06TryToClimbLadder:
+			_vm->_gameSys->insertSequence(0xFF, 20, 0xFE, 20, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->setAnimation(0xFD, _vm->_gnapId, 0);
+			_vm->_gameSys->insertSequence(0xFD, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gnapSequenceId = 0xFD;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapActionStatus = kAS06TryToClimbLadderDone;
+			break;
+		case kAS06TryToClimbLadderDone:
+			_vm->_gnapX = 6;
+			_vm->_gnapY = 7;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS06TalkToHorse:
+			_nextHorseSequenceId = 0xF6;
+			break;
+		case kAS06UseTwigOnHorse:
+			_nextPlatSequenceId = 0xFB;
+			break;
+		default:
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 1);
+		if (_vm->_platypusSequenceId == 0xFA) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_vm->invAdd(kItemGas);
+			_vm->setFlag(kGFGasTaken);
+			_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
+			_vm->setGrabCursorSprite(kItemGas);
+			_vm->_platypusActionStatus = -1;
+			_vm->_platX = 6;
+			_vm->_platY = 8;
+			_vm->_gameSys->insertSequence(0x107C1, _vm->_platypusId, 0, 0, kSeqNone, 0, 450 - _vm->_platGridX, 384 - _vm->_platGridY);
+			_vm->_platypusSequenceId = 0x7C1;
+			_vm->_platypusSequenceDatNum = 1;
+			_vm->setFlag(kGFUnk04);
+			_vm->_gnapActionStatus = -1;
+			_vm->showCursor();
+		}
+		if (_nextPlatSequenceId == 0xFB) {
+			_vm->_gameSys->setAnimation(0, 0, 1);
+			_nextHorseSequenceId = 0xF2;
+			_vm->_platypusActionStatus = 6;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextHorseSequenceId != -1) {
+		switch (_nextHorseSequenceId) {
+		case 0xF2:
+			_vm->setGrabCursorSprite(-1);
+			_vm->hideCursor();
+			_vm->_gameSys->setAnimation(0xFA, 256, 1);
+			_vm->_gameSys->insertSequence(0xF2, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x100, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0xF7, 20, 0xF8, 20, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0xFB, _vm->_platypusId, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0xFA, 256, 0xFB, _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
+			_vm->_platypusSequenceId = 0xFA;
+			_vm->_platypusSequenceDatNum = 0;
+			_vm->_gameSys->insertSequence(0x107B7, _vm->_gnapId, 0x100, _vm->_gnapId,
+				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+			_vm->_gnapSequenceId = 0x7B7;
+			_vm->_gnapSequenceDatNum = 1;
+			_currHorseSequenceId = _nextHorseSequenceId;
+			_nextHorseSequenceId = -1;
+			_nextPlatSequenceId = -1;
+			_vm->invRemove(kItemTwig);
+			break;
+		case 0xF6:
+			_vm->_gameSys->setAnimation(_nextHorseSequenceId, 120, 2);
+			_vm->_gameSys->insertSequence(0xF6, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
+			_horseTurnedBack = true;
+			_currHorseSequenceId = _nextHorseSequenceId;
+			_nextHorseSequenceId = -1;
+			_vm->_gnapActionStatus = -1;
+			break;
+		default:
+			_vm->_gameSys->setAnimation(_nextHorseSequenceId, 120, 2);
+			_vm->_gameSys->insertSequence(_nextHorseSequenceId, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
+			_currHorseSequenceId = _nextHorseSequenceId;
+			_nextHorseSequenceId = -1;
+			break;
+		}
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS07Platypus	= 0,
+	kHS07ExitHouse	= 1,
+	kHS07Dice		= 2,
+	kHS07Device		= 3,
+	kHS07WalkArea1	= 4,
+	kHS07WalkArea2	= 5,
+	kHS07WalkArea3	= 6
+};
+
+enum {
+	kAS07Wait		= 0,
+	kAS07LeaveScene	= 1
+};
+
+Scene07::Scene07(GnapEngine *vm) : Scene(vm) {
+}
+
+int Scene07::init() {
+	return 0x92;
+}
+
+void Scene07::updateHotspots() {
+	_vm->setHotspot(kHS07Platypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS07ExitHouse, 700, 125, 799, 290, SF_EXIT_NE_CURSOR);
+	_vm->setHotspot(kHS07Dice, 200, 290, 270, 360, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS07WalkArea1, 0, 0, 325, 445);
+	_vm->setHotspot(kHS07WalkArea2, 325, 0, 799, 445, _vm->_isLeavingScene ? SF_WALKABLE : SF_NONE);
+	_vm->setHotspot(kHS07WalkArea3, 160, 0, 325, 495);
+	_vm->setDeviceHotspot(kHS07Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFPlatypus))
+		_vm->_hotspots[kHS07Dice]._flags = SF_DISABLED;
+	_vm->_hotspotsCount = 7;
+}
+
+void Scene07::run() {
+	_vm->queueInsertDeviceIcon();
+	_vm->_gameSys->insertSequence(0x8C, 1, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x90, 1, 0, 0, kSeqLoop, 0, 0, 0);
+
+	_vm->invRemove(kItemGas);
+	_vm->invRemove(kItemNeedle);
+	
+	if (!_vm->isFlag(kGFPlatypus))
+		_vm->_gameSys->insertSequence(0x8D, 1, 0, 0, kSeqNone, 0, 0, 0);
+
+	if (_vm->_prevSceneNum == 8) {
+		_vm->initGnapPos(7, 7, kDirBottomLeft);
+		_vm->initPlatypusPos(9, 7, kDirUnk4);
+		_vm->endSceneInit();
+	} else {
+		_vm->_gnapX = 6;
+		_vm->_gnapY = 7;
+		_vm->_gnapId = 140;
+		_vm->_gnapSequenceId = 0x8F;
+		_vm->_gnapSequenceDatNum = 0;
+		_vm->_gnapIdleFacing = kDirBottomRight;
+		_vm->_gameSys->insertSequence(0x8F, 140, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
+		_vm->_gnapActionStatus = kAS07Wait;
+		_vm->_platX = 3;
+		_vm->_platY = 8;
+		_vm->_platypusId = 160;
+		_vm->_platypusSequenceId = 0x91;
+		_vm->_platypusSequenceDatNum = 0;
+		_vm->_platypusFacing = kDirNone;
+		_vm->_gameSys->insertSequence(0x91, 160, 0, 0, kSeqNone, 0, 0, 0);
+		_vm->endSceneInit();
+	}
+
+	_vm->_timers[3] = 600;
+	_vm->_timers[4] = _vm->getRandom(40) + 50;
+
+	while (!_vm->_sceneDone) {
+		if (!_vm->isSoundPlaying(0x10919))
+			_vm->playSound(0x10919, true);
+
+		if (_vm->testWalk(0, 1, 8, 7, 6, 7))
+			updateHotspots();
+
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS07Platypus:
+			switch (_vm->_verbCursor) {
+			case LOOK_CURSOR:
+				_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+				break;
+			case GRAB_CURSOR:
+				_vm->gnapKissPlatypus(0);
+				break;
+			case TALK_CURSOR:
+				_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+				_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+				break;
+			case PLAT_CURSOR:
+				break;
+			}
+			break;
+
+		case kHS07ExitHouse:
+			_vm->_isLeavingScene = true;
+			if (_vm->_gnapX > 8)
+				_vm->gnapWalkTo(_vm->_gnapX, 7, 0, 0x107AD, 1);
+			else
+				_vm->gnapWalkTo(8, 7, 0, 0x107AD, 1);
+			_vm->_gnapActionStatus = kAS07LeaveScene;
+			break;
+
+		case kHS07Dice:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(4, 8, 3, 3);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					break;
+				case GRAB_CURSOR:
+					_vm->setFlag(kGFPlatypus);
+					_vm->invAdd(kItemDice);
+					updateHotspots();
+					_vm->playGnapPullOutDevice(3, 3);
+					_vm->_gameSys->setAnimation(0x8E, 1, 2);
+					_vm->_gameSys->insertSequence(0x8E, 1, 141, 1, kSeqSyncWait, 0, 0, 0);
+					_vm->_gameSys->insertSequence(_vm->getGnapSequenceId(gskUseDevice, 0, 0) | 0x10000, _vm->_gnapId,
+						makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
+						kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
+					_vm->_gnapSequenceId = _vm->getGnapSequenceId(gskUseDevice, 0, 0);
+					_vm->_gnapSequenceDatNum = 1;
+					break;
+				case TALK_CURSOR:
+				case PLAT_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				}
+			}
+			break;
+
+		case kHS07Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+				_vm->_timers[4] = _vm->getRandom(40) + 50;
+			}
+			break;
+
+		case kHS07WalkArea1:
+		case kHS07WalkArea2:
+			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+			
+		case kHS07WalkArea3:
+			// Nothing
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+		}
+
+		updateAnimations();
+
+		if (!_vm->_isLeavingScene) {
+			_vm->updateGnapIdleSequence();
+			if (_vm->_platypusActionStatus < 0 && _vm->_gnapActionStatus < 0) {
+				if (_vm->_timers[0]) {
+					if (!_vm->_timers[1]) {
+						_vm->_timers[1] = _vm->getRandom(20) + 30;
+						int gnapRandomValue = _vm->getRandom(20);
+						// TODO Cleanup
+						if (_vm->_platypusFacing != kDirNone) {
+							if (gnapRandomValue != 0 || _vm->_platypusSequenceId != 0x7CA) {
+								if (gnapRandomValue != 1 || _vm->_platypusSequenceId != 0x7CA) {
+									if (_vm->_platY == 9)
+										_vm->playPlatypusSequence(0x107CA);
+								} else {
+									_vm->playPlatypusSequence(0x10845);
+								}
+							} else {
+								_vm->playPlatypusSequence(0x107CC);
+							}
+						} else if (gnapRandomValue != 0 || _vm->_platypusSequenceId != 0x7C9) {
+							if (gnapRandomValue != 1 || _vm->_platypusSequenceId != 0x7C9) {
+								if (_vm->_platY == 9)
+									_vm->playPlatypusSequence(0x107C9);
+							} else {
+								_vm->playPlatypusSequence(0x10844);
+							}
+						} else {
+							_vm->playPlatypusSequence(0x107CB);
+						}
+						_vm->_gameSys->setAnimation(_vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, 1);
+					}
+				} else {
+					_vm->_timers[0] = _vm->getRandom(75) + 75;
+					_vm->platypusMakeRoom();
+				}
+			} else {
+				_vm->_timers[0] = 100;
+				_vm->_timers[1] = 35;
+			}
+			playRandomSound(4);
+		}
+
+		_vm->checkGameKeys();
+
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[4] = _vm->getRandom(40) + 50;
+		}
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene07::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS07LeaveScene:
+			_vm->_newSceneNum = 8;
+			_vm->_sceneDone = true;
+			break;
+		}
+		_vm->_gnapActionStatus = -1;
+	}
+
+	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 2);
+		_vm->setGrabCursorSprite(kItemDice);
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kH08SPlatypus	= 0,
+	kHS08ExitBackdoor	= 1,
+	kHS08ExitCrash	= 2,
+	kHS08Man		= 3,
+	kHS08Door		= 4,
+	kHS08Meat		= 5,
+	kHS08Bone		= 6,
+	kHS08Toy		= 7,
+	kHS08WalkArea1	= 8,
+	kHS08Device		= 9,
+	kHS08WalkArea2	= 10
+};
+
+enum {
+	kAS08LeaveScene		= 0,
+	kAS08TalkMan		= 1,
+	kAS08LookMan		= 2,
+	kAS08LookDog		= 3,
+	kAS08GrabDog		= 4,
+	kAS08TalkDog		= 5,
+	kAS08PlatWithMan	= 6,
+	kAS08PlatWithDog	= 7
+};
+
+Scene08::Scene08(GnapEngine *vm) : Scene(vm) {
+	_nextDogSequenceId = -1;
+	_currDogSequenceId = -1;
+	_nextManSequenceId = -1;
+	_currManSequenceId = -1;
+}
+
+int Scene08::init() {
+	return 0x150;
+}
+
+void Scene08::updateHotspots() {
+	_vm->setHotspot(kH08SPlatypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08ExitBackdoor, 0, 280, 10, 400, SF_EXIT_L_CURSOR | SF_WALKABLE);
+	_vm->setHotspot(kHS08ExitCrash, 200, 590, 400, 599, SF_EXIT_D_CURSOR | SF_WALKABLE);
+	_vm->setHotspot(kHS08Man, 510, 150, 610, 380, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08Door, 350, 170, 500, 410, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08Meat, 405, 450, 480, 485, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08Bone, 200, 405, 270, 465, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08Toy, 540, 430, 615, 465, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS08WalkArea1, 290, 340, -1, -1);
+	_vm->setHotspot(kHS08WalkArea2, 0, 0, 799, 420);
+	_vm->setDeviceHotspot(kHS08Device, -1, -1, -1, -1);
+	if (_vm->isFlag(kGFBarnPadlockOpen))
+		_vm->_hotspots[kHS08Meat]._flags = SF_WALKABLE | SF_DISABLED;
+	if (_vm->isFlag(kGFTruckFilledWithGas))
+		_vm->_hotspots[kHS08Bone]._flags = SF_WALKABLE | SF_DISABLED;
+	if (_vm->isFlag(kGFTruckKeysUsed))
+		_vm->_hotspots[kHS08Toy]._flags = SF_WALKABLE | SF_DISABLED;
+	_vm->_hotspotsCount = 11;
+}
+
+void Scene08::updateAnimationsCb() {
+	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+		_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
+		_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+		_currDogSequenceId = _nextDogSequenceId;
+		if ( _nextDogSequenceId != 0x135 )
+			_nextDogSequenceId = 0x134;
+	}
+}
+
+void Scene08::run() {
+	_vm->queueInsertDeviceIcon();
+
+	_vm->_gameSys->insertSequence(0x14F, 1, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x14E, 256, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_currDogSequenceId = 0x135;
+	_nextDogSequenceId = 0x135;
+	
+	_vm->_gameSys->setAnimation(0x135, 100, 3);
+	_vm->_gameSys->insertSequence(_currDogSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_currManSequenceId = 0x140;
+	_nextManSequenceId = -1;
+	
+	_vm->_gameSys->setAnimation(0x140, 100, 2);
+	_vm->_gameSys->insertSequence(_currManSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->_timers[4] = _vm->getRandom(50) + 75;
+	
+	if (!_vm->isFlag(kGFBarnPadlockOpen))
+		_vm->_gameSys->insertSequence(0x144, 1, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (!_vm->isFlag(kGFTruckFilledWithGas))
+		_vm->_gameSys->insertSequence(0x145, 1, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (!_vm->isFlag(kGFTruckKeysUsed))
+		_vm->_gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
+	
+	_vm->initGnapPos(-1, 8, kDirBottomRight);
+	_vm->initPlatypusPos(-1, 7, kDirNone);
+	
+	_vm->endSceneInit();
+	
+	_vm->gnapWalkTo(1, 8, -1, 0x107B9, 1);
+	_vm->platypusWalkTo(1, 7, -1, 0x107C2, 1);
+	
+	_vm->_timers[5] = _vm->getRandom(40) + 50;
+	
+	while (!_vm->_sceneDone) {	
+		if (!_vm->isSoundPlaying(0x10919))
+			_vm->playSound(0x10919, true);
+	
+		_vm->testWalk(0, 0, -1, -1, -1, -1);
+		
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS08Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+				_vm->_timers[4] = _vm->getRandom(50) + 75;
+				_vm->_timers[5] = _vm->getRandom(40) + 50;
+			}
+			break;
+
+		case kH08SPlatypus:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapImpossible(0, 0);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					if (_vm->isFlag(kGFSceneFlag1))
+						_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+					else
+						_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
+					break;
+				case GRAB_CURSOR:
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapKissPlatypus(8);
+					break;
+				case TALK_CURSOR:
+					_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+					_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+					break;
+				case PLAT_CURSOR:
+					break;
+				}
+			}
+			break;
+
+		case kHS08ExitBackdoor:
+			_vm->_isLeavingScene = true;
+			_vm->gnapActionIdle(0x14D);
+			_vm->gnapWalkTo(0, 6, 0, 0x107AF, 1);
+			_vm->_gnapActionStatus = kAS08LeaveScene;
+			_vm->platypusWalkTo(0, 7, 1, 0x107CF, 1);
+			_vm->_newSceneNum = 9;
+			break;
+
+		case kHS08ExitCrash:
+			_vm->_isLeavingScene = true;
+			_vm->gnapActionIdle(0x14D);
+			_vm->gnapWalkTo(3, 9, 0, 0x107AE, 1);
+			_vm->_gnapActionStatus = kAS08LeaveScene;
+			_vm->platypusWalkTo(4, 9, 1, 0x107C1, 1);
+			_vm->_newSceneNum = 7;
+			break;
+
+		case kHS08Man:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(6, 6, 7, 0);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapWalkTo(6, 6, 0, 0x107BB, 1);
+					_vm->_gnapActionStatus = kAS08LookMan;
+					_vm->_gnapIdleFacing = kDirUpRight;
+					break;
+				case GRAB_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				case TALK_CURSOR:
+					_vm->_gnapIdleFacing = kDirUpLeft;
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapWalkTo(8, 6, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+					_vm->_gnapActionStatus = kAS08TalkMan;
+					break;
+				case PLAT_CURSOR:
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapUseDeviceOnPlatypuss();
+					_vm->platypusWalkTo(6, 6, 1, 0x107C2, 1);
+					_vm->_platypusActionStatus = kAS08PlatWithMan;
+					_vm->_platypusFacing = kDirNone;
+					_vm->playGnapIdle(6, 6);
+					break;
+				}
+			}
+			break;
+
+		case kHS08Door:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(4, 7, 5, 0);
+				_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
+				_vm->_gnapActionStatus = kAS08GrabDog;
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->playGnapScratchingHead(6, 0);
+					_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
+					_vm->_gnapActionStatus = kAS08LookDog;
+					break;
+				case GRAB_CURSOR:
+					_vm->gnapWalkTo(4, 7, 0, 0x107BB, 1);
+					_vm->_gnapActionStatus = kAS08GrabDog;
+					_vm->_gnapIdleFacing = kDirUpRight;
+					break;
+				case TALK_CURSOR:
+					_vm->_gnapIdleFacing = kDirUpRight;
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapWalkTo(4, 7, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
+					_vm->_gnapActionStatus = kAS08TalkDog;
+					break;
+				case PLAT_CURSOR:
+					_vm->setFlag(kGFSceneFlag1);
+					_vm->gnapActionIdle(0x14D);
+					_vm->gnapUseDeviceOnPlatypuss();
+					_vm->platypusWalkTo(3, 7, 1, 0x107C2, 1);
+					_vm->_platypusActionStatus = kAS08PlatWithDog;
+					_vm->_platypusFacing = kDirNone;
+					_vm->playGnapIdle(3, 7);
+					break;
+				}
+			}
+			break;
+
+		case kHS08Meat:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(6, 8, 5, 6);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->playGnapScratchingHead(6, 7);
+					break;
+				case GRAB_CURSOR:
+					if (_currDogSequenceId == 0x135) {
+						_vm->playGnapScratchingHead(6, 7);
+					} else {
+						_vm->gnapActionIdle(0x14D);
+						_vm->playGnapPullOutDevice(6, 7);
+						_vm->playGnapUseDevice(0, 0);
+						_nextDogSequenceId = 0x149;
+					}
+					break;
+				case TALK_CURSOR:
+				case PLAT_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				}
+			}
+			break;
+
+		case kHS08Bone:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(2, 7, 3, 6);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->playGnapScratchingHead(3, 6);
+					break;
+				case GRAB_CURSOR:
+					if (_currDogSequenceId == 0x135) {
+						_vm->playGnapScratchingHead(3, 6);
+					} else {
+						_vm->gnapActionIdle(0x14D);
+						_vm->playGnapPullOutDevice(3, 6);
+						_vm->playGnapUseDevice(0, 0);
+						_nextDogSequenceId = 0x14A;
+					}
+					break;
+				case TALK_CURSOR:
+				case PLAT_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				}
+			}
+			break;
+
+		case kHS08Toy:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(8, 7, 7, 6);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->playGnapScratchingHead(7, 6);
+					break;
+				case GRAB_CURSOR:
+					if (_currDogSequenceId == 0x135) {
+						_vm->playGnapScratchingHead(7, 6);
+					} else {
+						_vm->gnapActionIdle(0x14D);
+						_vm->playGnapPullOutDevice(7, 6);
+						_vm->playGnapUseDevice(0, 0);
+						_nextDogSequenceId = 0x14B;
+					}
+					break;
+				case TALK_CURSOR:
+				case PLAT_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				}
+			}
+			break;
+
+		case kHS08WalkArea1:
+		case kHS08WalkArea2:
+			_vm->gnapActionIdle(0x14D);
+			_vm->gnapWalkTo(-1, 6, -1, -1, 1);
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left) {
+				_vm->gnapActionIdle(0x14D);
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+		}
+	
+		updateAnimations();
+
+		if (!_vm->_isLeavingScene) {
+			_vm->updatePlatypusIdleSequence();
+			_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[4]) {
+				_vm->_timers[4] = _vm->getRandom(50) + 125;
+				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextManSequenceId == -1 &&
+					(_currDogSequenceId == 0x134 || _currDogSequenceId == 0x135)) {
+					int _gnapRandomValue = _vm->getRandom(4);
+					switch (_gnapRandomValue) {
+					case 0:
+						_nextManSequenceId = 0x138;
+						break;
+					case 1:
+						_nextManSequenceId = 0x136;
+						break;
+					case 2:
+						_nextManSequenceId = 0x13B;
+						break;
+					case 3:
+						_nextManSequenceId = 0x13A;
+						break;
+					}
+				}
+			}
+			playRandomSound(5);
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[4] = _vm->getRandom(50) + 75;
+			_vm->_timers[5] = _vm->getRandom(40) + 50;
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene08::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS08LeaveScene:
+			_vm->_sceneDone = true;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS08TalkMan:
+			_nextManSequenceId = 0x13F;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS08LookMan:
+			_nextManSequenceId = 0x140;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS08LookDog:
+			_nextManSequenceId = 0x137;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS08GrabDog:
+			if (_currDogSequenceId == 0x135)
+				_nextDogSequenceId = 0x133;
+			else
+				_nextDogSequenceId = 0x13C;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS08TalkDog:
+			if (_currDogSequenceId == 0x135)
+				_nextDogSequenceId = 0x133;
+			else
+				_nextDogSequenceId = 0x13C;
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 1);
+		switch (_vm->_platypusActionStatus) {
+		case kAS08PlatWithDog:
+			_nextDogSequenceId = 0x147;
+			break;
+		case kAS08PlatWithMan:
+			_nextManSequenceId = 0x140;
+			_vm->_platypusActionStatus = -1;
+			break;
+		}
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextManSequenceId != -1) {
+		_vm->_gameSys->setAnimation(_nextManSequenceId, 100, 2);
+		_vm->_gameSys->insertSequence(_nextManSequenceId, 100, _currManSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+		_currManSequenceId = _nextManSequenceId;
+		_nextManSequenceId = -1;
+	}
+	
+	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
+		if (_currDogSequenceId == 0x147)
+			_vm->_platypusActionStatus = -1;
+		if (_currDogSequenceId == 0x149 || _currDogSequenceId == 0x14A || _currDogSequenceId == 0x14B) {
+			if (_vm->getRandom(2) != 0)
+				_nextManSequenceId = 0x13D;
+			else
+				_nextManSequenceId = 0x13E;
+		} else if (_currDogSequenceId == 0x133)
+			_nextManSequenceId = 0x139;
+		if (_nextDogSequenceId == 0x149 || _nextDogSequenceId == 0x14A || _nextDogSequenceId == 0x14B) {
+			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
+			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+			switch (_nextDogSequenceId) {
+			case 0x149:
+				_vm->setFlag(kGFBarnPadlockOpen);
+				_vm->_hotspots[kHS08Meat]._flags = SF_DISABLED | SF_WALKABLE;
+				_vm->_gameSys->removeSequence(0x144, 1, true);
+				break;
+			case 0x14A:
+				_vm->setFlag(kGFTruckFilledWithGas);
+				_vm->_hotspots[kHS08Bone]._flags = SF_DISABLED | SF_WALKABLE;
+				_vm->_gameSys->removeSequence(0x145, 1, true);
+				break;
+			case 0x14B:
+				_vm->setFlag(kGFTruckKeysUsed);
+				_vm->_hotspots[kHS08Toy]._flags = SF_DISABLED | SF_WALKABLE;
+				_vm->_gameSys->removeSequence(0x146, 1, true);
+				break;
+			}
+			_currDogSequenceId = _nextDogSequenceId;
+			_nextDogSequenceId = 0x134;
+		} else if (_nextDogSequenceId == 0x147) {
+			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
+			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->insertSequence(0x148, 160, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
+			_currDogSequenceId = _nextDogSequenceId;
+			_nextDogSequenceId = 0x134;
+			_vm->_platX = 1;
+			_vm->_platY = 8;
+			_vm->_platypusId = 160;
+			_vm->_platypusSequenceId = 0x148;
+			_vm->_platypusFacing = kDirUnk4;
+			_vm->_platypusSequenceDatNum = 0;
+			if (_vm->_gnapX == 1 && _vm->_gnapY == 8)
+				_vm->gnapWalkStep();
+		} else if (_nextDogSequenceId != -1) {
+			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
+			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
+			_currDogSequenceId = _nextDogSequenceId;
+			if (_nextDogSequenceId != 0x135)
+				_nextDogSequenceId = 0x134;
+			if (_currDogSequenceId == 0x133) {
+				_vm->_timers[2] = _vm->getRandom(30) + 20;
+				_vm->_timers[3] = _vm->getRandom(50) + 200;
+				_vm->_gameSys->insertSequence(0x14D, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+				_vm->_gnapSequenceId = 0x14D;
+				_vm->_gnapIdleFacing = kDirUpRight;
+				_vm->_gnapSequenceDatNum = 0;
+				_vm->_gnapActionStatus = -1;
+			}
+		}
+	}
+}
+
+/*****************************************************************************/
+
+enum {
+	kHS09Platypus		= 0,
+	kHS09ExitKitchen	= 1,
+	kHS09ExitHouse		= 2,
+	kHS09Trash			= 3,
+	kHS09Device			= 4,
+	kHS09WalkArea1		= 5,
+	kHS09WalkArea2		= 6,
+	kHS09WalkArea3		= 7
+};
+
+enum {
+	kAS09LeaveScene			= 0,
+	kAS09SearchTrash		= 1,
+	kAS09SearchTrashDone	= 2
+};
+
+Scene09::Scene09(GnapEngine *vm) : Scene(vm) {
+}
+
+int Scene09::init() {
+	return 0x4E;
+}
+
+void Scene09::updateHotspots() {
+	_vm->setHotspot(kHS09Platypus, 0, 200, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS09ExitKitchen, 280, 200, 380, 400, SF_EXIT_U_CURSOR);
+	_vm->setHotspot(kHS09ExitHouse, 790, 200, 799, 450, SF_EXIT_R_CURSOR | SF_WALKABLE);
+	_vm->setHotspot(kHS09Trash, 440, 310, 680, 420, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
+	_vm->setHotspot(kHS09WalkArea1, 0, 0, 799, 400);
+	_vm->setHotspot(kHS09WalkArea2, 0, 0, 630, 450);
+	_vm->setHotspot(kHS09WalkArea2, 0, 0, 175, 495);
+	_vm->setDeviceHotspot(kHS09Device, -1, -1, -1, -1);
+	_vm->_hotspotsCount = 8;
+}
+
+void Scene09::run() {	
+	_vm->queueInsertDeviceIcon();
+	
+	_vm->_gameSys->insertSequence(0x4D, 1, 0, 0, kSeqLoop, 0, 0, 0);
+	_vm->_gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0);
+	
+	if (_vm->_prevSceneNum == 8) {
+		_vm->initGnapPos(11, 8, kDirBottomLeft);
+		_vm->initPlatypusPos(12, 7, kDirUnk4);
+		_vm->endSceneInit();
+		_vm->gnapWalkTo(9, 8, -1, 0x107BA, 1);
+		_vm->platypusWalkTo(9, 7, -1, 0x107D2, 1);
+	} else {
+		_vm->initGnapPos(4, 7, kDirBottomRight);
+		_vm->initPlatypusPos(5, 7, kDirNone);
+		_vm->endSceneInit();
+	}
+
+	_vm->_timers[4] = _vm->getRandom(150) + 50;
+	_vm->_timers[5] = _vm->getRandom(40) + 50;
+
+	while (!_vm->_sceneDone) {
+		if (!_vm->isSoundPlaying(0x10919))
+			_vm->playSound(0x10919, true);
+	
+		_vm->testWalk(0, 0, -1, -1, -1, -1);
+	
+		_vm->updateMouseCursor();
+		_vm->updateCursorByHotspot();
+	
+		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
+		_vm->updateGrabCursorSprite(0, 0);
+	
+		switch (_vm->_sceneClickedHotspot) {
+		case kHS09Device:
+			if (_vm->_gnapActionStatus < 0) {
+				_vm->runMenu();
+				updateHotspots();
+				_vm->_timers[4] = _vm->getRandom(150) + 50;
+				_vm->_timers[5] = _vm->getRandom(40) + 50;
+			}
+			break;
+
+		case kHS09Platypus:
+			switch (_vm->_verbCursor) {
+			case LOOK_CURSOR:
+				_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
+				break;
+			case GRAB_CURSOR:
+				_vm->gnapKissPlatypus(0);
+				break;
+			case TALK_CURSOR:
+				_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
+				_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
+				break;
+			case PLAT_CURSOR:
+				break;
+			}
+			break;
+
+		case kHS09ExitKitchen:
+			_vm->_isLeavingScene = true;
+			_vm->_newSceneNum = 10;
+			_vm->gnapWalkTo(4, 7, 0, 0x107BF, 1);
+			_vm->_gnapActionStatus = kAS09LeaveScene;
+			_vm->platypusWalkTo(4, 8, -1, 0x107D2, 1);
+			_vm->_platypusFacing = kDirUnk4;
+			break;
+
+		case kHS09ExitHouse:
+			_vm->_isLeavingScene = true;
+			_vm->_newSceneNum = 8;
+			_vm->gnapWalkTo(10, -1, 0, 0x107AB, 1);
+			_vm->_gnapActionStatus = kAS09LeaveScene;
+			_vm->platypusWalkTo(10, -1, -1, 0x107CD, 1);
+			_vm->_platypusFacing = kDirUnk4;
+			break;
+
+		case kHS09Trash:
+			if (_vm->_grabCursorSpriteIndex >= 0) {
+				_vm->playGnapShowCurrItem(9, 6, 8, 0);
+			} else {
+				switch (_vm->_verbCursor) {
+				case LOOK_CURSOR:
+					_vm->playGnapScratchingHead(8, 3);
+					break;
+				case GRAB_CURSOR:
+					_vm->_gnapActionStatus = kAS09SearchTrash;
+					_vm->gnapWalkTo(9, 6, 0, 0x107BC, 1);
+					break;
+				case TALK_CURSOR:
+				case PLAT_CURSOR:
+					_vm->playGnapImpossible(0, 0);
+					break;
+				}
+			}
+			break;
+
+		case kHS09WalkArea1:
+		case kHS09WalkArea2:
+		case kHS09WalkArea3:
+			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+			break;
+
+		default:
+			if (_vm->_mouseClickState._left) {
+				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
+				_vm->_mouseClickState._left = false;
+			}
+			break;
+		}
+	
+		updateAnimations();
+	
+		if (!_vm->_isLeavingScene && _vm->_gnapActionStatus != 1 && _vm->_gnapActionStatus != 2) {
+			_vm->updatePlatypusIdleSequence();
+			_vm->updateGnapIdleSequence();
+			if (!_vm->_timers[4]) {
+				_vm->_timers[4] = _vm->getRandom(150) + 100;
+				if (_vm->_timers[4] & 1)
+					_vm->_gameSys->insertSequence(0x49, 1, 0, 0, kSeqNone, 0, 0, 0);
+				else
+					_vm->_gameSys->insertSequence(0x4A, 1, 0, 0, kSeqNone, 0, 0, 0);
+			}
+			playRandomSound(5);
+		}
+	
+		_vm->checkGameKeys();
+	
+		if (_vm->isKeyStatus1(8)) {
+			_vm->clearKeyStatus1(8);
+			_vm->runMenu();
+			updateHotspots();
+			_vm->_timers[4] = _vm->getRandom(150) + 50;
+			_vm->_timers[5] = _vm->getRandom(40) + 50;
+		}
+		
+		_vm->gameUpdateTick();
+	}
+}
+
+void Scene09::updateAnimations() {
+	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
+		_vm->_gameSys->setAnimation(0, 0, 0);
+		switch (_vm->_gnapActionStatus) {
+		case kAS09LeaveScene:
+			_vm->_sceneDone = true;
+			_vm->_gnapActionStatus = -1;
+			break;
+		case kAS09SearchTrash:
+			_vm->_gameSys->setAnimation(0x4C, 120, 0);
+			_vm->_gameSys->insertSequence(0x4C, 120, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
+			_vm->_gameSys->removeSequence(0x4B, 2, true);
+			_vm->_gnapSequenceId = 0x4C;
+			_vm->_gnapId = 120;
+			_vm->_gnapIdleFacing = kDirUpLeft;
+			_vm->_gnapSequenceDatNum = 0;
+			_vm->_gnapX = 9;
+			_vm->_gnapY = 6;
+			_vm->_gnapActionStatus = kAS09SearchTrashDone;
+			break;
+		case kAS09SearchTrashDone:
+			_vm->_gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0);
+			_vm->_timers[2] = 360;
+			_vm->_timers[4] = _vm->getRandom(150) + 100;
+			_vm->_gnapActionStatus = -1;
+			break;
+		}
+	}
+}
+
+} // End of namespace Gnap
diff --git a/engines/gnap/scenes/group0.h b/engines/gnap/scenes/group0.h
new file mode 100644
index 0000000000..a705ba1483
--- /dev/null
+++ b/engines/gnap/scenes/group0.h
@@ -0,0 +1,183 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+#ifndef GNAP_GROUP01_H
+#define GNAP_GROUP01_H
+
+#include "gnap/debugger.h"
+
+namespace Gnap {
+
+class GnapEngine;
+class CutScene;
+
+class Scene01: public Scene {
+public:
+	Scene01(GnapEngine *vm);
+	~Scene01();
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	int _pigsIdCtr;
+	int _smokeIdCtr;
+	Graphics::Surface *_spaceshipSurface;
+};
+
+class Scene02: public Scene {
+public:
+	Scene02(GnapEngine *vm);
+	~Scene02() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	int _truckGrillCtr;
+	int _nextChickenSequenceId;
+	int _currChickenSequenceId;
+	int _gnapTruckSequenceId;
+};
+
+class Scene03: public Scene {
+public:
+	Scene03(GnapEngine *vm);
+	~Scene03() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	bool _platypusHypnotized;	
+	bool _platypusScared;
+	int _nextPlatSequenceId;
+	int _nextFrogSequenceId;
+	int _currFrogSequenceId;
+};
+
+class Scene04: public Scene {
+public:
+	Scene04(GnapEngine *vm);
+	~Scene04() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	bool _triedWindow;
+	int _dogIdCtr;
+	int _nextDogSequenceId;
+	int _currDogSequenceId;
+};
+
+class Scene05: public Scene {
+public:
+	Scene05(GnapEngine *vm);
+	~Scene05() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	int _nextChickenSequenceId;
+	int _currChickenSequenceId;
+};
+
+class Scene06: public Scene {
+public:
+	Scene06(GnapEngine *vm);
+	~Scene06() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+
+private:
+	bool _horseTurnedBack;
+	int _nextPlatSequenceId;
+	int _nextHorseSequenceId;
+	int _currHorseSequenceId;
+};
+
+class Scene07: public Scene {
+public:
+	Scene07(GnapEngine *vm);
+	~Scene07() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+};
+
+class Scene08: public Scene {
+public:
+	Scene08(GnapEngine *vm);
+	~Scene08() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb();
+
+private:
+	int _nextDogSequenceId;
+	int _currDogSequenceId;
+	int _nextManSequenceId;
+	int _currManSequenceId;
+};
+
+class Scene09: public Scene {
+public:
+	Scene09(GnapEngine *vm);
+	~Scene09() {}
+
+	virtual int init();
+	virtual void updateHotspots();
+	virtual void run();
+	virtual void updateAnimations();
+	virtual void updateAnimationsCb() {}
+};
+
+} // End of namespace Gnap
+
+#endif // GNAP_GROUP01_H
diff --git a/engines/gnap/scenes/scene00.cpp b/engines/gnap/scenes/intro.cpp
index 9ee0eb38f2..0463f12ac6 100644
--- a/engines/gnap/scenes/scene00.cpp
+++ b/engines/gnap/scenes/intro.cpp
@@ -25,18 +25,18 @@
 #include "gnap/gnap.h"
 #include "gnap/gamesys.h"
 #include "gnap/resource.h"
-#include "gnap/scenes/scene00.h"
+#include "gnap/scenes/intro.h"
 
 namespace Gnap {
 
-Scene00::Scene00(GnapEngine *vm) : Scene(vm) {
+SceneIntro::SceneIntro(GnapEngine *vm) : Scene(vm) {
 }
 
-int Scene00::init() {
+int SceneIntro::init() {
 	return 0x37C;
 }
 
-void Scene00::run() {
+void SceneIntro::run() {
 	const int animIdArr[] = {
 		0x356, 0x357, 0x358, 0x35A, 0x35F,
 		0x360, 0x361, 0x362, 0x363, 0x364,
diff --git a/engines/gnap/scenes/scene00.h b/engines/gnap/scenes/intro.h
index d71722bcbc..c744999a69 100644
--- a/engines/gnap/scenes/scene00.h
+++ b/engines/gnap/scenes/intro.h
@@ -20,8 +20,8 @@
  *
  */
 
-#ifndef GNAP_SCENE00_H
-#define GNAP_SCENE00_H
+#ifndef GNAP_INTRO_H
+#define GNAP_INTRO_H
 
 #include "gnap/debugger.h"
 #include "gnap/scenes/scenecore.h"
@@ -30,10 +30,10 @@ namespace Gnap {
 
 class GnapEngine;
 
-class Scene00: public Scene {
+class SceneIntro: public Scene {
 public:
-	Scene00(GnapEngine *vm);
-	~Scene00() {}
+	SceneIntro(GnapEngine *vm);
+	~SceneIntro() {}
 
 	virtual int init();
 	virtual void updateHotspots() {}
@@ -44,4 +44,4 @@ public:
 
 } // End of namespace Gnap
 
-#endif // GNAP_SCENE00_H
+#endif // GNAP_INTRO_H
diff --git a/engines/gnap/scenes/scene01.cpp b/engines/gnap/scenes/scene01.cpp
deleted file mode 100644
index 39f572a63b..0000000000
--- a/engines/gnap/scenes/scene01.cpp
+++ /dev/null
@@ -1,383 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene01.h"
-
-namespace Gnap {
-
-enum {
-	kHS01Platypus	= 0,
-	kHS01ExitTruck	= 1,
-	kHS01Mud		= 2,
-	kHS01Pigs		= 3,
-	kHS01Spaceship	= 4,
-	kHS01Device		= 5,
-	kHS01WalkArea1	= 6,
-	kHS01WalkArea2	= 7,
-	kHS01WalkArea3	= 8,
-	kHS01WalkArea4	= 9,
-	kHS01WalkArea5	= 10,
-	kHS01WalkArea6	= 11,
-	kHS01WalkArea7	= 12,
-	kHS01WalkArea8	= 13
-};
-
-enum {
-	kAS01LookSpaceship		= 1,
-	kAS01LookSpaceshipDone	= 2,
-	kAS01LeaveScene			= 3,
-	kAS01TakeMud			= 5,
-	kAS01LookPigs			= 6,
-	kAS01UsePigs			= 7
-};
-
-Scene01::Scene01(GnapEngine *vm) : Scene(vm) {
-	_pigsIdCtr = 0;
-	_smokeIdCtr = 0;
-	_spaceshipSurface = nullptr;
-}
-
-Scene01::~Scene01() {
-	delete _spaceshipSurface;
-}
-
-int Scene01::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	_vm->_gameSys->setAnimation(0, 0, 3);
-	return 0x88;
-}
-
-void Scene01::updateHotspots() {
-	_vm->setHotspot(kHS01Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS01ExitTruck, 780, 226, 800, 455, SF_EXIT_R_CURSOR | SF_WALKABLE, 10, 6);
-	_vm->setHotspot(kHS01Mud, 138, 282, 204, 318, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 5);
-	_vm->setHotspot(kHS01Pigs, 408, 234, 578, 326, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 4);
-	_vm->setHotspot(kHS01Spaceship, 0, 200, 94, 292, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 1, 6);
-	_vm->setHotspot(kHS01WalkArea1, 0, 0, 162, 426);
-	_vm->setHotspot(kHS01WalkArea2, 162, 0, 237, 396);
-	_vm->setHotspot(kHS01WalkArea3, 237, 0, 319, 363);
-	_vm->setHotspot(kHS01WalkArea4, 520, 0, 800, 404);
-	_vm->setHotspot(kHS01WalkArea5, 300, 447, 800, 600);
-	_vm->setHotspot(kHS01WalkArea6, 678, 0, 800, 404);
-	_vm->setHotspot(kHS01WalkArea7, 0, 0, 520, 351);
-	_vm->setHotspot(kHS01WalkArea8, 0, 546, 300, 600);
-	_vm->setDeviceHotspot(kHS01Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS01Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_vm->isFlag(kGFMudTaken))
-		_vm->_hotspots[kHS01Mud]._flags = SF_WALKABLE | SF_DISABLED;
-	_vm->_hotspotsCount = 14;
-}
-
-void Scene01::run() {
-	// NOTE Removed _s01_dword_474380 which was set when the mud was taken
-	// which is also set in the global game flags.
-	
-	_vm->playSound(0x1091C, true);
-	_vm->startSoundTimerC(5);
-
-	_vm->_gameSys->setAnimation(134, 20, 4);
-	_vm->_gameSys->insertSequence(134, 20, 0, 0, kSeqNone, 0, 0, 0);
-
-	_vm->_gameSys->setAnimation(0x7F, 40, 2);
-	_vm->_gameSys->insertSequence(0x7F, 40, 0, 0, kSeqNone, 0, 0, 0);
-
-	_vm->_timers[4] = _vm->getRandom(100) + 300;
-
-	if (!_vm->isFlag(kGFMudTaken))
-		_vm->_gameSys->insertSequence(129, 40, 0, 0, kSeqNone, 0, 0, 0);
-
-	_vm->queueInsertDeviceIcon();
-
-	if (_vm->_prevSceneNum == 2) {
-		_vm->initGnapPos(11, 6, kDirBottomLeft);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(12, 6, kDirUnk4);
-		_vm->endSceneInit();
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->platypusWalkTo(9, 6, -1, 0x107C2, 1);
-		_vm->gnapWalkTo(8, 6, -1, 0x107B9, 1);
-	} else {
-		_vm->initGnapPos(1, 6, kDirBottomRight);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(1, 7, kDirNone);
-		_vm->endSceneInit();
-	}
-
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-		_vm->testWalk(0, 3, -1, -1, -1, -1);
-
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-
-		switch (_vm->_sceneClickedHotspot) {
-		
-		case kHS01Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-
-		case kHS01Platypus:
-			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapKissPlatypus(0);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS01Spaceship:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 2);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpLeft;
-						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
-							_vm->_gnapActionStatus = kAS01LookSpaceship;
-						break;
-					case GRAB_CURSOR:
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS01Mud:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 3);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(3, 3);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 3) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS01TakeMud;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS01Pigs:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 7, 2);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS01LookPigs;
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 7, 2) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS01UsePigs;
-						break;
-					case TALK_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 7, 2) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS01LookPigs;
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS01ExitTruck:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107AB, 1);
-				_vm->_gnapActionStatus = kAS01LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, -1, 0x107CD, 1);
-				_vm->_newSceneNum = 2;
-			}
-			break;
-
-		case kHS01WalkArea1:
-		case kHS01WalkArea2:
-		case kHS01WalkArea3:
-		case kHS01WalkArea4:
-		case kHS01WalkArea5:
-		case kHS01WalkArea6:
-		case kHS01WalkArea7:
-		case kHS01WalkArea8:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-
-		}
-
-		updateAnimations();
-
-		if (!_vm->isSoundPlaying(0x1091C))
-			_vm->playSound(0x1091C, true);
-
-		if (!_vm->_isLeavingScene) {
-			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
-				_vm->updatePlatypusIdleSequence();
-			if (_vm->_gnapActionStatus < 0)
-				_vm->updateGnapIdleSequence();
-			if (_vm->_timers[4] == 0) {
-				// Update bird animation
-				_vm->_timers[4] = _vm->getRandom(100) + 300;
-				if (_vm->getRandom(1) == 0)
-					_vm->_gameSys->insertSequence(0x84, 180, 0, 0, kSeqNone, 0, 0, 0);
-				else
-					_vm->_gameSys->insertSequence(0x83, 180, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			_vm->playSoundC();
-		}
-
-		_vm->checkGameKeys();
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene01::updateAnimations() {	
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS01LookSpaceship:
-			_spaceshipSurface = _vm->_gameSys->createSurface(47);
-			_vm->_gameSys->insertSpriteDrawItem(_spaceshipSurface, 0, 0, 255);
-			_vm->_gameSys->setAnimation(133, 256, 0);
-			_vm->_gameSys->insertSequence(133, 256, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gnapActionStatus = kAS01LookSpaceshipDone;
-			break;
-
-		case kAS01LookSpaceshipDone:
-			_vm->_gameSys->removeSequence(133, 256, true);
-			_vm->_gameSys->removeSpriteDrawItem(_spaceshipSurface, 255);
-			_vm->deleteSurface(&_spaceshipSurface);
-			_vm->_gnapActionStatus = -1;
-			break;
-
-		case kAS01LeaveScene:
-			_vm->_sceneDone = true;
-			break;
-
-		case kAS01TakeMud:
-			_vm->playGnapPullOutDevice(2, 3);
-			_vm->playGnapUseDevice(0, 0);
-			_vm->_gameSys->insertSequence(128, 40, 129, 40, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(128, 40, 3);
-			_vm->_gnapActionStatus = -1;
-			break;
-
-		case kAS01LookPigs:
-			_vm->playSound(138, false);
-			_vm->playSound(139, false);
-			_vm->playSound(140, false);
-			_vm->_gnapActionStatus = -1;
-			break;
-
-		case kAS01UsePigs:
-			_vm->playGnapPullOutDevice(7, 2);
-			_vm->playGnapUseDevice(0, 0);
-			_vm->_gameSys->insertSequence(135, 39, 0, 0, kSeqNone, 25, _vm->getRandom(140) - 40, 0);
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-
-	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 3);
-		_vm->invAdd(kItemMud);
-		_vm->setGrabCursorSprite(kItemMud);
-		_vm->setFlag(kGFMudTaken);
-		updateHotspots();
-	}
-
-	if (_vm->_gameSys->getAnimationStatus(4) == 2) {
-		_smokeIdCtr = (_smokeIdCtr + 1) % 2;
-		_vm->_gameSys->setAnimation(0x86, _smokeIdCtr + 20, 4);
-		_vm->_gameSys->insertSequence(0x86, _smokeIdCtr + 20,
-			0x86, (_smokeIdCtr + 1) % 2 + 20,
-			kSeqSyncWait, 0, 0, 0);
-	}
-
-	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
-		_pigsIdCtr = (_pigsIdCtr + 1) % 2;
-		_vm->_gameSys->setAnimation(0x7F, _pigsIdCtr + 40, 2);
-		_vm->_gameSys->insertSequence(0x7F, _pigsIdCtr + 40,
-			0x7F, (_pigsIdCtr + 1) % 2 + 40,
-			kSeqSyncWait, 0, 0, 0);
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene01.h b/engines/gnap/scenes/scene01.h
deleted file mode 100644
index 8aca9fa360..0000000000
--- a/engines/gnap/scenes/scene01.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE01_H
-#define GNAP_SCENE01_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene01: public Scene {
-public:
-	Scene01(GnapEngine *vm);
-	~Scene01();
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	int _pigsIdCtr;
-	int _smokeIdCtr;
-	Graphics::Surface *_spaceshipSurface;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE01_H
diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp
deleted file mode 100644
index b95810ad7e..0000000000
--- a/engines/gnap/scenes/scene02.cpp
+++ /dev/null
@@ -1,538 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene02.h"
-
-namespace Gnap {
-
-enum {
-	kHS02Platypus	= 0,
-	kHS02Chicken	= 1,
-	kHS02Truck1		= 2,
-	kHS02Truck2		= 3,
-	kHS02TruckGrill	= 4,
-	kHS02Device		= 5,
-	kHS02ExitHouse	= 6,
-	kHS02ExitBarn	= 7,
-	kHS02ExitCreek	= 8,
-	kHS02ExitPigpen	= 9,
-	kHS02WalkArea1	= 10,
-	kHS02WalkArea2	= 11,
-	kHS02WalkArea3	= 12,
-	kHS02WalkArea4	= 13
-};
-
-enum {
-	kAS02UseTruckNoKeys			= 0,
-	kAS02UseGasWithTruck		= 1,
-	kAS02UseTruckGas			= 2,
-	kAS02UseTruckNoGas			= 3,
-	kAS02GrabTruckGrill			= 5,
-	kAS02LeaveScene				= 6,
-	kAS02TalkChicken			= 7,
-	kAS02GrabChicken			= 8,
-	kAS02GrabChickenDone		= 9,
-	kAS02UseTruckNoKeysDone		= 11,
-	kAS02UseGasWithTruckDone	= 12,
-	kAS02UseTwigWithChicken		= 16
-};
-
-Scene02::Scene02(GnapEngine *vm) : Scene(vm) {
-	_truckGrillCtr = 0;
-	_nextChickenSequenceId = 0;
-	_currChickenSequenceId = 0;
-	_gnapTruckSequenceId = 0;
-}
-
-int Scene02::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	return _vm->isFlag(kGFTruckKeysUsed) ? 0x15A : 0x15B;
-}
-
-void Scene02::updateHotspots() {
-	_vm->setHotspot(kHS02Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE);
-	_vm->setHotspot(kHS02Chicken, 606, 455, 702, 568, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 7, 8);
-	_vm->setHotspot(kHS02Truck1, 385, 258, 464, 304, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 5);
-	_vm->setHotspot(kHS02Truck2, 316, 224, 390, 376, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 6);
-	_vm->setHotspot(kHS02TruckGrill, 156, 318, 246, 390, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 7);
-	_vm->setHotspot(kHS02ExitHouse, 480, 120, 556, 240, SF_EXIT_U_CURSOR, 7, 5);
-	_vm->setHotspot(kHS02ExitBarn, 610, 0, 800, 164, SF_EXIT_U_CURSOR, 10, 5);
-	_vm->setHotspot(kHS02ExitCreek, 780, 336, 800, 556, SF_EXIT_R_CURSOR | SF_WALKABLE, 10, 8);
-	_vm->setHotspot(kHS02ExitPigpen, 0, 300, 20, 600, SF_EXIT_L_CURSOR | SF_WALKABLE, 0, 8);
-	_vm->setHotspot(kHS02WalkArea1, 92, 140, 304, 430, 0, 3, 1);
-	_vm->setHotspot(kHS02WalkArea2, 0, 0, 800, 380);
-	_vm->setHotspot(kHS02WalkArea3, 0, 0, 386, 445);
-	_vm->setHotspot(kHS02WalkArea4, 386, 0, 509, 410);
-	_vm->setDeviceHotspot(kHS02Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS02Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	_vm->_hotspotsCount = 14;
-}
-
-void Scene02::run() {
-	_vm->playSound(0x1091C, true);
-	_vm->startSoundTimerC(6);
-
-	_currChickenSequenceId = 0x14B;
-	_vm->_gameSys->setAnimation(0x14B, 179, 2);
-	_vm->_gameSys->insertSequence(0x14B, 179, 0, 0, kSeqNone, 0, 0, 0);
-
-	_nextChickenSequenceId = -1;
-	_vm->_timers[5] = _vm->getRandom(20) + 30;
-	_vm->_timers[4] = _vm->getRandom(100) + 300;
-	
-	_vm->queueInsertDeviceIcon();
-	
-	switch (_vm->_prevSceneNum) {
-	case 3:
-		_vm->initGnapPos(11, 6, kDirBottomLeft);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(12, 6, kDirUnk4);
-		_vm->endSceneInit();
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->platypusWalkTo(9, 6, -1, 0x107C2, 1);
-		_vm->gnapWalkTo(8, 6, -1, 0x107BA, 1);
-		break;
-	case 4:
-		_vm->initGnapPos(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, kDirBottomLeft);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, kDirUnk4);
-		_vm->endSceneInit();
-		_vm->gnapWalkTo(7, 6, 0, 0x107B9, 1);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->platypusWalkTo(8, 6, 1, 0x107C2, 1);
-		updateHotspots();
-		_vm->_gameSys->waitForUpdate();
-		break;
-	case 47:
-		_vm->clearFlag(kGFUnk25);
-		_vm->initGnapPos(5, 6, kDirBottomLeft);
-		_vm->initPlatypusPos(6, 7, kDirUnk4);
-		_vm->endSceneInit();
-		break;
-	case 49:
-		_vm->initGnapPos(5, 6, kDirBottomRight);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(6, 7, kDirNone);
-		_vm->endSceneInit();
-		break;
-	default:
-		_vm->initGnapPos(-1, 6, kDirBottomRight);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(-1, 7, kDirNone);
-		_vm->endSceneInit();
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->platypusWalkTo(2, 7, -1, 0x107C2, 1);
-		_vm->gnapWalkTo(2, 8, -1, 0x107B9, 1);
-		break;
-	}
-	
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();	
-		_vm->updateCursorByHotspot();
-	
-		_vm->testWalk(0, 6, 7, 6, 8, 6);
-	
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS02Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-
-		case kHS02Platypus:
-			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapKissPlatypus(0);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS02Chicken:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemTwig) {
-					_vm->_gnapIdleFacing = kDirUpRight;
-					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1,
-						0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-					_vm->_gnapActionStatus = kAS02UseTwigWithChicken;
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y + 1, 9, 8);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(9, 8);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
-							_vm->_gnapActionStatus = kAS02GrabChicken;
-						else
-							_vm->_gnapActionStatus = -1;
-						break;
-					case TALK_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS02TalkChicken;
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS02Truck1:
-		case kHS02Truck2:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemKeys) {
-					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1)) {
-						_vm->setGrabCursorSprite(-1);
-						_vm->invRemove(kItemKeys);
-						if (_vm->isFlag(kGFTruckFilledWithGas))
-							_vm->_gnapActionStatus = kAS02UseTruckGas;
-						else
-							_vm->_gnapActionStatus = kAS02UseTruckNoGas;
-					}
-				} else if (_vm->_grabCursorSpriteIndex == kItemGas) {
-					_vm->_hotspots[kHS02WalkArea4]._flags |= SF_WALKABLE;
-					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1))
-						_vm->_gnapActionStatus = kAS02UseGasWithTruck;
-					_vm->_hotspots[kHS02WalkArea4]._flags &= ~SF_WALKABLE;
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 2, 2);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(2, 2);
-						break;
-					case GRAB_CURSOR:
-						if (_vm->isFlag(kGFTruckKeysUsed)) {
-							if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1)) {
-								if (_vm->isFlag(kGFTruckFilledWithGas))
-									_vm->_gnapActionStatus = kAS02UseTruckGas;
-								else
-									_vm->_gnapActionStatus = kAS02UseTruckNoGas;
-							}
-						} else {
-							_vm->_gnapIdleFacing = kDirUnk4;
-							if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 2, 2) | 0x10000, 1))
-								_vm->_gnapActionStatus = kAS02UseTruckNoKeys;
-						}
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS02TruckGrill:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 2, 4);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(2, 4);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS02GrabTruckGrill;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS02ExitHouse:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, 0, 0x107AD, 1);
-				_vm->_gnapActionStatus = kAS02LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, -1, 0x107C1, 1);
-				updateHotspots();
-				_vm->_newSceneNum = 4;
-			}
-			break;
-
-		case kHS02ExitBarn:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, 0x107AD, 1);
-				_vm->_gnapActionStatus = kAS02LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[7].x + 1, _vm->_hotspotsWalkPos[7].y, -1, 0x107C1, 1);
-				updateHotspots();
-				_vm->_newSceneNum = 5;
-			}
-			break;
-
-		case kHS02ExitCreek:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1);
-				_vm->_gnapActionStatus = kAS02LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, -1, 0x107CD, 1);
-				_vm->_newSceneNum = 3;
-			}
-			break;
-
-		case kHS02ExitPigpen:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, 0, 0x107AF, 1);
-				_vm->_gnapActionStatus = kAS02LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[9].x, _vm->_hotspotsWalkPos[9].y, -1, 0x107CF, 1);
-				_vm->_newSceneNum = 1;
-			}
-			break;
-
-		case kHS02WalkArea1:
-		case kHS02WalkArea2:
-		case kHS02WalkArea3:
-		case kHS02WalkArea4:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-		}
-	
-		updateAnimations();
-	
-		if (!_vm->isSoundPlaying(0x1091C))
-			_vm->playSound(0x1091C, true);
-	
-		if (!_vm->_isLeavingScene) {
-			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
-				_vm->updatePlatypusIdleSequence();
-			if (_vm->_gnapActionStatus < 0)
-				_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[4]) {
-				// Update bird animation
-				_vm->_timers[4] = _vm->getRandom(100) + 300;
-				if (_vm->getRandom(2) != 0)
-					_vm->_gameSys->insertSequence(0x156, 256, 0, 0, kSeqNone, 0, 0, 0);
-				else
-					_vm->_gameSys->insertSequence(0x154, 256, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			if (!_vm->_timers[5] && _nextChickenSequenceId == -1 && _vm->_gnapActionStatus != 7 && _vm->_gnapActionStatus != 8) {
-				if (_vm->getRandom(6) != 0) {
-					_nextChickenSequenceId = 0x14B;
-					_vm->_timers[5] = _vm->getRandom(20) + 30;
-				} else {
-					_nextChickenSequenceId = 0x14D;
-					_vm->_timers[5] = _vm->getRandom(20) + 50;
-				}
-			}
-			_vm->playSoundC();
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene02::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		switch (_vm->_gnapActionStatus) {
-		case kAS02UseTruckNoKeys:
-			_vm->_gameSys->insertSequence(0x14E, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x14E, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x14E;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS02UseTruckNoKeysDone;
-			break;
-		case kAS02UseGasWithTruck:
-			_vm->_gameSys->insertSequence(0x151, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x151, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x151;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->invRemove(kItemGas);
-			_vm->setGrabCursorSprite(-1);
-			_vm->setFlag(kGFTruckFilledWithGas);
-			_vm->_gnapActionStatus = kAS02UseGasWithTruckDone;
-			break;
-		case kAS02UseTruckGas:
-			_vm->_timers[5] = 9999;
-			_vm->_timers[4] = 9999;
-			_vm->hideCursor();
-			_vm->setGrabCursorSprite(-1);
-			if (!_vm->isFlag(kGFTruckKeysUsed)) {
-				_vm->_gameSys->insertSequence(0x14F, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-				_vm->_gameSys->waitForUpdate();
-				_vm->setFlag(kGFTruckKeysUsed);
-				_vm->_gnapSequenceId = 0x14F;
-				_vm->_gnapSequenceDatNum = 0;
-				_vm->invRemove(kItemKeys);
-				_vm->setGrabCursorSprite(-1);
-			}
-			_vm->_newSceneNum = 47;
-			_vm->_sceneDone = true;
-			break;
-		case kAS02UseTruckNoGas:
-			_vm->hideCursor();
-			_vm->setGrabCursorSprite(-1);
-			_vm->_timers[4] = 250;
-			if (!_vm->isFlag(kGFTruckKeysUsed)) {
-				_vm->_gameSys->insertSequence(0x14F, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-				_vm->_gameSys->waitForUpdate();
-				_vm->setFlag(kGFTruckKeysUsed);
-				_vm->_gnapSequenceId = 0x14F;
-				_vm->_gnapSequenceDatNum = 0;
-				_vm->invRemove(kItemKeys);
-				_vm->setGrabCursorSprite(-1);
-			}
-			_vm->_newSceneNum = 47;
-			_vm->_sceneDone = true;
-			_vm->setFlag(kGFUnk25);
-			break;
-		case kAS02GrabTruckGrill:
-			switch (_truckGrillCtr) {
-			case 0:
-				_gnapTruckSequenceId = 0x158;
-				break;
-			case 1:
-				_gnapTruckSequenceId = 0x159;
-				break;
-			case 2:
-				_gnapTruckSequenceId = 0x157;
-				break;
-			}
-			_truckGrillCtr = (_truckGrillCtr + 1) % 3;
-			_vm->_gameSys->insertSequence(_gnapTruckSequenceId, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(_gnapTruckSequenceId, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = _gnapTruckSequenceId;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS02LeaveScene:
-			_vm->_sceneDone = true;
-			break;
-		case kAS02TalkChicken:
-			_nextChickenSequenceId = 0x14C;
-			break;
-		case kAS02GrabChicken:
-			_nextChickenSequenceId = 0x150;
-			_vm->_timers[2] = 100;
-			break;
-		case kAS02GrabChickenDone:
-			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId, 0x150, 179, kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-			_vm->_gnapSequenceId = 0x7B5;
-			_vm->_gnapSequenceDatNum = 1;
-			_currChickenSequenceId = 0x14B;
-			_vm->_gameSys->setAnimation(0x14B, 179, 2);
-			_vm->_gameSys->insertSequence(_currChickenSequenceId, 179, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gnapActionStatus = -1;
-			_vm->_timers[5] = 30;
-			break;
-		case kAS02UseTwigWithChicken:
-			_vm->playGnapShowItem(5, 0, 0);
-			_vm->_gameSys->insertSequence(0x155, 179, _currChickenSequenceId, 179, kSeqSyncExists, 0, 0, 0);
-			_currChickenSequenceId = 0x155;
-			_nextChickenSequenceId = -1;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS02UseTruckNoKeysDone:
-		case kAS02UseGasWithTruckDone:
-		default:
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
-		if (_nextChickenSequenceId == 0x150) {
-			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 0);
-			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->removeSequence(_currChickenSequenceId, 179, true);
-			_nextChickenSequenceId = -1;
-			_currChickenSequenceId = -1;
-			_vm->_gnapActionStatus = kAS02GrabChickenDone;
-			_vm->_timers[5] = 500;
-		} else if (_nextChickenSequenceId == 0x14C) {
-			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 2);
-			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, _currChickenSequenceId, 179, kSeqSyncWait, 0, 0, 0);
-			_currChickenSequenceId = _nextChickenSequenceId;
-			_nextChickenSequenceId = -1;
-			_vm->_gnapActionStatus = -1;
-		} else if (_nextChickenSequenceId != -1) {
-			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 179, 2);
-			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 179, _currChickenSequenceId, 179, kSeqSyncWait, 0, 0, 0);
-			_currChickenSequenceId = _nextChickenSequenceId;
-			_nextChickenSequenceId = -1;
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene02.h b/engines/gnap/scenes/scene02.h
deleted file mode 100644
index 187f24d35a..0000000000
--- a/engines/gnap/scenes/scene02.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE02_H
-#define GNAP_SCENE02_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene02: public Scene {
-public:
-	Scene02(GnapEngine *vm);
-	~Scene02() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	int _truckGrillCtr;
-	int _nextChickenSequenceId;
-	int _currChickenSequenceId;
-	int _gnapTruckSequenceId;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE02_H
diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp
deleted file mode 100644
index 3c35ee32bd..0000000000
--- a/engines/gnap/scenes/scene03.cpp
+++ /dev/null
@@ -1,517 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene03.h"
-namespace Gnap {
-
-enum {
-	kHS03Platypus			= 0,
-	kHS03Grass				= 1,
-	kHS03ExitTruck			= 2,
-	kHS03Creek				= 3,
-	kHS03TrappedPlatypus	= 4,
-	kHS03Device				= 5,
-	kHS03WalkAreas1			= 6,
-	kHS03WalkAreas2			= 7,
-	kHS03PlatypusWalkArea	= 8,
-	kHS03WalkAreas3			= 9
-};
-
-enum {
-	kAS03LeaveScene			= 0,
-	kAS03FreePlatypus		= 1,
-	kAS03HypnotizePlat		= 2,
-	kAS03HypnotizeScaredPlat= 3,
-	kAS03FreePlatypusDone	= 4,
-	kAS03GrabPlatypus		= 5,
-	kAS03GrabCreek			= 6,
-	kAS03GrabCreekDone		= 7,
-	kAS03GrabScaredPlatypus	= 8
-};
-
-Scene03::Scene03(GnapEngine *vm) : Scene(vm) {
-	_nextPlatSequenceId = -1;
-	_platypusScared = false;
-	_platypusHypnotized = false;
-	_nextFrogSequenceId = -1;
-	_currFrogSequenceId = -1;
-}
-
-int Scene03::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	_vm->_gameSys->setAnimation(0, 0, 1);
-	_vm->_gameSys->setAnimation(0, 0, 5);
-	return 0x1CC;
-}
-
-void Scene03::updateHotspots() {
-	_vm->setHotspot(kHS03Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS03Grass, 646, 408, 722, 458, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
-	_vm->setHotspot(kHS03ExitTruck, 218, 64, 371, 224, SF_EXIT_U_CURSOR | SF_WALKABLE, 4, 4);
-	_vm->setHotspot(kHS03Creek, 187, 499, 319, 587, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
-	_vm->setHotspot(kHS03TrappedPlatypus, 450, 256, 661, 414, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 2, 5);
-	_vm->setHotspot(kHS03WalkAreas1, 0, 500, 300, 600);
-	_vm->setHotspot(kHS03WalkAreas2, 300, 447, 800, 600);
-	_vm->setHotspot(kHS03PlatypusWalkArea, 235, 0, 800, 600);
-	_vm->setHotspot(kHS03WalkAreas3, 0, 0, 800, 354);
-	_vm->setDeviceHotspot(kHS03Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS03Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_vm->isFlag(kGFGrassTaken))
-		_vm->_hotspots[kHS03Grass]._flags = SF_WALKABLE | SF_DISABLED;
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS03TrappedPlatypus]._flags = SF_DISABLED;
-	if (_vm->isFlag(kGFPlatypus) || _platypusHypnotized)
-		_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
-	_vm->_hotspotsCount = 10;
-}
-
-void Scene03::run() {
-	_vm->playSound(0x10925, true);
-	_vm->startSoundTimerC(7);
-	
-	_vm->_gameSys->insertSequence(0x1CA, 251, 0, 0, kSeqLoop, 0, 0, 0);
-	_vm->_gameSys->insertSequence(0x1CB, 251, 0, 0, kSeqLoop, 0, 0, 0);
-	
-	_platypusHypnotized = false;
-	
-	_vm->initGnapPos(3, 4, kDirBottomRight);
-	
-	_vm->_gameSys->insertSequence(0x1C6, 253, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_currFrogSequenceId = 0x1C6;
-	_nextFrogSequenceId = -1;
-	_vm->_gameSys->setAnimation(0x1C6, 253, 2);
-	
-	_vm->_timers[6] = _vm->getRandom(20) + 30;
-	_vm->_timers[4] = _vm->getRandom(100) + 300;
-	_vm->_timers[5] = _vm->getRandom(100) + 200;
-	
-	if (_vm->isFlag(kGFPlatypus)) {
-		_vm->initPlatypusPos(5, 4, kDirNone);
-	} else {
-		_vm->_timers[1] = _vm->getRandom(40) + 20;
-		_vm->_gameSys->setAnimation(0x1C2, 99, 1);
-		_vm->_gameSys->insertSequence(0x1C2, 99, 0, 0, kSeqNone, 0, 0, 0);
-		_vm->_platypusSequenceId = 0x1C2;
-		_vm->_platypusSequenceDatNum = 0;
-	}
-	
-	_vm->_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!_vm->isFlag(kGFGrassTaken))
-		_vm->_gameSys->insertSequence(0x1B2, 253, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->queueInsertDeviceIcon();
-	
-	_vm->endSceneInit();
-	
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->platypusWalkTo(4, 7, -1, 0x107C2, 1);
-	_vm->gnapWalkTo(3, 6, -1, 0x107B9, 1);
-	
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS03Platypus:
-			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapKissPlatypus(0);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS03Grass:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->isFlag(kGFGrassTaken)) {
-					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(9, 6);
-						break;
-					case GRAB_CURSOR:
-						_vm->playGnapPullOutDevice(9, 6);
-						_vm->playGnapUseDevice(0, 0);
-						_vm->_gameSys->insertSequence(0x1B3, 253, 0x1B2, 253, kSeqSyncWait, 0, 0, 0);
-						_vm->_gameSys->setAnimation(0x1B3, 253, 5);
-						_vm->_hotspots[kHS03Grass]._flags |= SF_WALKABLE | SF_DISABLED;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS03ExitTruck:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107AD, 1);
-				_vm->_gnapActionStatus = kAS03LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, -1, 0x107C2, 1);
-				_vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE;
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 2;
-				else
-					_vm->_newSceneNum = 33;
-			}
-			break;
-
-		case kHS03Creek:
-			if (_vm->_gnapActionStatus == -1) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(2, 8);
-						break;
-					case GRAB_CURSOR:
-						if (!_vm->isFlag(kGFPlatypus))
-							_vm->_hotspots[kHS03PlatypusWalkArea]._flags |= SF_WALKABLE;
-						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, _vm->_hotspotsWalkPos[3].x + 1, _vm->_hotspotsWalkPos[3].y + 1) | 0x10000, 1))
-							_vm->_gnapActionStatus = kAS03GrabCreek;
-						if (!_vm->isFlag(kGFPlatypus))
-							_vm->_hotspots[kHS03PlatypusWalkArea]._flags &= ~SF_WALKABLE;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS03TrappedPlatypus:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->isFlag(kGFPlatypus)) {
-					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 8, 4);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(8, 4);
-						break;
-					case GRAB_CURSOR:
-						if (_platypusHypnotized) {
-							_vm->gnapWalkTo(7, 6, 0, 0x107B5, 1);
-							_vm->_gnapActionStatus = kAS03FreePlatypus;
-						} else {
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-							if (_platypusScared)
-								_vm->_gnapActionStatus = kAS03GrabScaredPlatypus;
-							else
-								_vm->_gnapActionStatus = kAS03GrabPlatypus;
-						}
-						break;
-					case TALK_CURSOR:
-						if (_platypusHypnotized) {
-							_vm->playGnapBrainPulsating(8, 4);
-						} else {
-							_vm->_gnapIdleFacing = kDirBottomRight;
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-							if (_platypusScared)
-								_vm->_gnapActionStatus = kAS03HypnotizeScaredPlat;
-							else
-								_vm->_gnapActionStatus = kAS03HypnotizePlat;
-						}
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS03Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-
-		case kHS03WalkAreas1:
-		case kHS03WalkAreas2:
-		case kHS03WalkAreas3:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-
-		case kHS03PlatypusWalkArea:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->isFlag(kGFPlatypus) || _platypusHypnotized) {
-					_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				} else {
-					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107B5, 1);
-					if (_platypusScared)
-						_vm->_gnapActionStatus = kAS03GrabScaredPlatypus;
-					else
-						_vm->_gnapActionStatus = kAS03GrabPlatypus;
-				}
-			}
-			break;
-			
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-			
-		}
-
-		updateAnimations();
-	
-		if (!_vm->isSoundPlaying(0x10925))
-			_vm->playSound(0x10925, true);
-	
-		if (!_vm->_isLeavingScene) {
-			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
-				_vm->updatePlatypusIdleSequence();
-			if (_vm->_gnapActionStatus < 0)
-				_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[1] && !_platypusScared) {
-				_vm->_timers[1] = _vm->getRandom(40) + 20;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && !_vm->isFlag(kGFPlatypus) && !_platypusHypnotized)
-					_nextPlatSequenceId = 450;
-			}
-			if (!_vm->_timers[6]) {
-				_vm->_timers[6] = _vm->getRandom(20) + 30;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextFrogSequenceId == -1) {
-					if (_vm->getRandom(5) == 1)
-						_nextFrogSequenceId = 0x1C6;
-					else
-						_nextFrogSequenceId = 0x1C7;
-				}
-			}
-			if (!_vm->_timers[4]) {
-				// Update bird animation
-				_vm->_timers[4] = _vm->getRandom(100) + 300;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0)
-					_vm->_gameSys->insertSequence(_vm->getRandom(2) != 0 ? 0x1C8 : 0x1C3, 253, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			if (!_vm->_timers[5]) {
-				_vm->_timers[5] = _vm->getRandom(100) + 200;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0) {
-					_vm->_gameSys->setAnimation(0x1C5, 253, 4);
-					_vm->_gameSys->insertSequence(0x1C5, 253, 0, 0, kSeqNone, 0, 0, 0);
-				}
-			}
-			_vm->playSoundC();
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-			_vm->_timers[5] = _vm->getRandom(100) + 200;
-			_vm->_timers[4] = _vm->getRandom(100) + 300;
-			_vm->_timers[6] = _vm->getRandom(20) + 30;
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene03::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS03LeaveScene:
-			_vm->_sceneDone = true;
-			break;
-		case kAS03FreePlatypus:
-			_nextPlatSequenceId = 0x1BC;
-			break;
-		case kAS03FreePlatypusDone:
-			_vm->_gnapActionStatus = -1;
-			_vm->_platX = 6;
-			_vm->_platY = 6;
-			_vm->_platypusFacing = kDirUnk4;
-			_vm->_platypusId = 120;
-			_vm->_gameSys->insertSequence(0x107CA, _vm->_platypusId, 0x1BC, 99,
-				kSeqSyncWait, 0, 75 * _vm->_platX - _vm->_platGridX, 48 * _vm->_platY - _vm->_platGridY);
-			_vm->_gameSys->insertSequence(0x1B7, 99, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_platypusSequenceDatNum = 1;
-			_vm->_platypusSequenceId = 0x7CA;
-			_vm->setFlag(kGFPlatypus);
-			_nextPlatSequenceId = -1;
-			updateHotspots();
-			break;
-		case kAS03HypnotizePlat:
-			_vm->playGnapBrainPulsating(0, 0);
-			_vm->addFullScreenSprite(0x106, 255);
-			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
-			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
-			while (_vm->_gameSys->getAnimationStatus(1) != 2)
-				_vm->gameUpdateTick();
-			_vm->removeFullScreenSprite();
-			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
-			_vm->_gameSys->insertSequence(0x1BA, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_platypusSequenceId = 0x1BA;
-			_vm->_gnapActionStatus = -1;
-			_platypusHypnotized = true;
-			updateHotspots();
-			break;
-		case kAS03HypnotizeScaredPlat:
-			_vm->playGnapBrainPulsating(0, 0);
-			_vm->_gameSys->insertSequence(0x1BF, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x1BF, 99, 1);
-			while (_vm->_gameSys->getAnimationStatus(1) != 2)
-				_vm->gameUpdateTick();
-			_vm->addFullScreenSprite(0x106, 255);
-			_vm->_gameSys->setAnimation(0x1C9, 256, 1);
-			_vm->_gameSys->insertSequence(0x1C9, 256, 0, 0, kSeqNone, 0, 0, 0);
-			while (_vm->_gameSys->getAnimationStatus(1) != 2)
-				_vm->gameUpdateTick();
-			_vm->removeFullScreenSprite();
-			_vm->_gameSys->setAnimation(0x1BA, 99, 1);
-			_vm->_gameSys->insertSequence(0x1BA, 99, 447, 99, kSeqSyncWait, 0, 0, 0);
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_platypusSequenceId = 0x1BA;
-			_vm->_gnapActionStatus = -1;
-			_platypusHypnotized = true;
-			updateHotspots();
-			break;
-		case kAS03GrabPlatypus:
-			_nextPlatSequenceId = 0x1BD;
-			_platypusHypnotized = false;
-			break;
-		case kAS03GrabScaredPlatypus:
-			_nextPlatSequenceId = 0x1C0;
-			_platypusHypnotized = false;
-			break;
-		case kAS03GrabCreek:
-			_vm->_gameSys->insertSequence(0x1B4, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x1B4, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x1B4;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS03GrabCreekDone;
-			break;
-		default:
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
-		if (_nextPlatSequenceId == 0x1BD || _nextPlatSequenceId == 0x1C0) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_platypusScared = true;
-			_vm->_gameSys->insertSequence(0x1B5, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(_nextPlatSequenceId, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0x1B5;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapIdleFacing = kDirNone;
-			_vm->_platypusSequenceId = _nextPlatSequenceId;
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_gameSys->setAnimation(_nextPlatSequenceId, 99, 1);
-			_nextPlatSequenceId = -1;
-			_vm->_gnapActionStatus = -1;
-		} else if (_nextPlatSequenceId == 0x1BC) {
-			_vm->_gnapX = 3;
-			_vm->_gnapY = 6;
-			_vm->_gameSys->insertSequence(0x1B6, 120, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x1BC, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x1BC, 99, 0);
-			_vm->_gnapId = 20 * _vm->_gnapY;
-			_vm->_gnapSequenceId = 0x1B6;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapIdleFacing = kDirNone;
-			_vm->_gnapActionStatus = kAS03FreePlatypusDone;
-			_nextPlatSequenceId = -1;
-		} else if (_nextPlatSequenceId == 0x1C2 && !_platypusScared) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_vm->_gameSys->insertSequence(0x1C2, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_vm->_platypusSequenceId = 0x1C2;
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_gameSys->setAnimation(0x1C2, 99, 1);
-			_nextPlatSequenceId = -1;
-		} else if (_nextPlatSequenceId == -1 && _platypusScared && !_platypusHypnotized) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_vm->_gameSys->setAnimation(0x1BE, 99, 1);
-			_vm->_gameSys->insertSequence(0x1BE, 99, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_vm->_platypusSequenceId = 0x1BE;
-			_vm->_platypusSequenceDatNum = 0;
-			_nextPlatSequenceId = -1;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextFrogSequenceId != -1) {
-		_vm->_gameSys->setAnimation(_nextFrogSequenceId, 253, 2);
-		_vm->_gameSys->insertSequence(_nextFrogSequenceId, 253, _currFrogSequenceId, 253, kSeqSyncWait, 0, 0, 0);
-		_currFrogSequenceId = _nextFrogSequenceId;
-		_nextFrogSequenceId = -1;
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(5) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 5);
-		_vm->invAdd(kItemGrass);
-		_vm->setGrabCursorSprite(kItemGrass);
-		_vm->setFlag(kGFGrassTaken);
-		updateHotspots();
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene03.h b/engines/gnap/scenes/scene03.h
deleted file mode 100644
index aac06ccac2..0000000000
--- a/engines/gnap/scenes/scene03.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE03_H
-#define GNAP_SCENE03_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene03: public Scene {
-public:
-	Scene03(GnapEngine *vm);
-	~Scene03() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	bool _platypusHypnotized;	
-	bool _platypusScared;
-	int _nextPlatSequenceId;
-	int _nextFrogSequenceId;
-	int _currFrogSequenceId;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE03_H
diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp
deleted file mode 100644
index d61ceac57e..0000000000
--- a/engines/gnap/scenes/scene04.cpp
+++ /dev/null
@@ -1,572 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene04.h"
-
-namespace Gnap {
-
-enum {
-	kHS04Platypus	= 0,
-	kHS04Twig		= 1,
-	kHS04Dog		= 2,
-	kHS04Axe		= 3,
-	kHS04Door		= 4,
-	kHS04ExitTruck	= 5,
-	kHS04Device		= 6,
-	kHS04Window		= 7,
-	kHS04ExitBarn	= 8,
-	kHS04WalkArea1	= 9,
-	kHS04WalkArea2	= 10
-};
-
-enum {
-	kAS04OpenDoor			= 1,
-	kAS04GetKeyFirst		= 2,
-	kAS04GetKeyAnother		= 3,
-	kAS04LeaveScene			= 4,
-	kAS04GetKeyFirstDone	= 6,
-	kAS04GetKeyFirst2		= 7,
-	kAS04GetKeyAnother2		= 8,
-	kAS04GetKeyAnotherDone	= 9,
-	kAS04OpenDoorDone		= 10,
-	kAS04GrabDog			= 12,
-	kAS04GrabAxe			= 13
-};
-
-Scene04::Scene04(GnapEngine *vm) : Scene(vm) {
-	_dogIdCtr = 0;
-	_triedWindow = false;
-	_nextDogSequenceId = -1;
-	_currDogSequenceId = -1;
-}
-
-int Scene04::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	_vm->_gameSys->setAnimation(0, 0, 1);
-	_vm->_gameSys->setAnimation(0, 0, 2);
-	return 0x214;
-}
-
-void Scene04::updateHotspots() {
-	_vm->setHotspot(kHS04Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS04Twig, 690, 394, 769, 452, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 9, 6);
-	_vm->setHotspot(kHS04Dog, 550, 442, 680, 552, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 8);
-	_vm->setHotspot(kHS04Axe, 574, 342, 680, 412, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 7);
-	_vm->setHotspot(kHS04Door, 300, 244, 386, 410, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 7);
-	_vm->setHotspot(kHS04ExitTruck, 226, 580, 688, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 9);
-	_vm->setHotspot(kHS04Window, 121, 295, 237, 342, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 3, 7);
-	_vm->setHotspot(kHS04ExitBarn, 585, 154, 800, 276, SF_EXIT_U_CURSOR, 10, 8);
-	_vm->setHotspot(kHS04WalkArea1, 0, 0, 562, 461);
-	_vm->setHotspot(kHS04WalkArea2, 562, 0, 800, 500);
-	_vm->setDeviceHotspot(kHS04Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS04Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_vm->isFlag(kGFTwigTaken))
-		_vm->_hotspots[kHS04Twig]._flags = SF_WALKABLE | SF_DISABLED;
-	if (_vm->isFlag(kGFPlatypusTalkingToAssistant) || _vm->_cursorValue == 1)
-		_vm->_hotspots[kHS04Axe]._flags = SF_DISABLED;
-	_vm->_hotspotsCount = 11;
-}
-
-void Scene04::run() {
-	_vm->playSound(0x1091C, true);
-	_vm->startSoundTimerC(4);
-
-	_vm->_gameSys->insertSequence(0x210, 139 - _dogIdCtr, 0, 0, kSeqNone, 0, 0, 0);
-
-	_currDogSequenceId = 0x210;
-	_nextDogSequenceId = -1;
-	
-	_vm->_gameSys->setAnimation(0x210, 139 - _dogIdCtr, 3);
-	_dogIdCtr = (_dogIdCtr + 1) % 2;
-	_vm->_timers[6] = _vm->getRandom(20) + 60;
-	_vm->_timers[5] = _vm->getRandom(150) + 300;
-	_vm->_timers[7] = _vm->getRandom(150) + 200;
-	_vm->_timers[8] = _vm->getRandom(150) + 400;
-
-	if (!_vm->isFlag(kGFPlatypusTalkingToAssistant) && _vm->_cursorValue == 4)
-		_vm->_gameSys->insertSequence(0x212, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!_vm->isFlag(kGFTwigTaken))
-		_vm->_gameSys->insertSequence(0x1FE, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->queueInsertDeviceIcon();
-	
-	if (_vm->isFlag(kGFPlatyPussDisguised)) {
-		_vm->_timers[3] = 300;
-		// TODO setCursor((LPCSTR)IDC_WAIT);
-		_vm->setGrabCursorSprite(kItemKeys);
-		_vm->_gnapX = 4;
-		_vm->_gnapY = 7;
-		_vm->_gnapId = 140;
-		_vm->_platX = 6;
-		_vm->_platY = 7;
-		_vm->_platypusId = 141;
-		_vm->_gameSys->insertSequence(0x107B5, 140, 0, 0, kSeqNone, 0, 300 - _vm->_gnapGridX, 336 - _vm->_gnapGridY);
-		_vm->_gameSys->insertSequence(0x20C, 141, 0, 0, kSeqNone, 0, 0, 0);
-		_vm->_gameSys->insertSequence(0x208, 121, 0, 0, kSeqNone, 0, 0, 0);
-		_vm->_gameSys->insertSequence(0x209, 121, 0x208, 121, kSeqSyncWait, 0, 0, 0);
-		_vm->endSceneInit();
-		_vm->invRemove(kItemDisguise);
-		_vm->invAdd(kItemKeys);
-		_vm->setFlag(kGFKeysTaken);
-		_vm->clearFlag(kGFPlatyPussDisguised);
-		_vm->_platypusSequenceId = 0x20C;
-		_vm->_platypusSequenceDatNum = 0;
-		_vm->_platypusFacing = kDirBottomRight;
-		_vm->_gnapSequenceId = 0x7B5;
-		_vm->_gnapSequenceDatNum = 1;
-		_vm->_gameSys->waitForUpdate();
-	} else {
-		_vm->_gameSys->insertSequence(0x209, 121, 0, 0, kSeqNone, 0, 0, 0);
-		if (_vm->_prevSceneNum == 2) {
-			_vm->initGnapPos(5, 11, kDirUpRight);
-			if (_vm->isFlag(kGFPlatypus))
-				_vm->initPlatypusPos(6, 11, kDirUpLeft);
-			_vm->endSceneInit();
-			if (_vm->isFlag(kGFPlatypus))
-				_vm->platypusWalkTo(5, 8, -1, 0x107C2, 1);
-			_vm->gnapWalkTo(6, 9, -1, 0x107BA, 1);
-		} else if (_vm->_prevSceneNum == 38) {
-			_vm->initGnapPos(5, 7, kDirBottomRight);
-			_vm->initPlatypusPos(4, 7, kDirNone);
-			_vm->endSceneInit();
-		} else {
-			_vm->initGnapPos(12, 9, kDirBottomRight);
-			if (_vm->isFlag(kGFPlatypus))
-				_vm->initPlatypusPos(12, 8, kDirNone);
-			_vm->endSceneInit();
-			if (_vm->isFlag(kGFPlatypus))
-				_vm->platypusWalkTo(9, 8, -1, 0x107C2, 1);
-		_vm->gnapWalkTo(9, 9, -1, 0x107BA, 1);
-		}
-	}
-	
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-		
-		_vm->testWalk(0, 4, -1, -1, -1, -1);
-	
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS04Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-
-		case kHS04Platypus:
-			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						if (_vm->_cursorValue == 4)
-							_vm->gnapKissPlatypus(0);
-						else
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04Twig:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowItem(_vm->_grabCursorSpriteIndex, 9, 6);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
-						break;
-					case GRAB_CURSOR:
-						_vm->playGnapPullOutDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
-						_vm->playGnapUseDevice(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
-						_vm->_gameSys->insertSequence(0x1FD, 100, 510, 100, kSeqSyncWait, 0, 0, 0);
-						_vm->_gameSys->setAnimation(0x1FD, 100, 2);
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04Axe:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 9, 5);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS04GrabAxe;
-						_vm->setFlag(kGFPlatypusTalkingToAssistant);
-						updateHotspots();
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04Dog:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 9, 7);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->gnapWalkTo(_vm->_gnapX, _vm->_gnapY, 0, -1, 1)) {
-							_vm->playGnapMoan2(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
-							_nextDogSequenceId = 0x20F;
-						}
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1))
-							_vm->_gnapActionStatus = kAS04GrabDog;
-						break;
-					case TALK_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						if (_vm->gnapWalkTo(_vm->_gnapX, _vm->_gnapY, 0, -1, 1)) {
-							_vm->playGnapBrainPulsating(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y);
-							_nextDogSequenceId = 0x20E;
-						}
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04Door:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 4, 3);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapScratchingHead(4, 3);
-						break;
-					case GRAB_CURSOR:
-						if (_vm->_cursorValue == 1) {
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1);
-							_vm->_gnapActionStatus = kAS04OpenDoor;
-							_vm->_timers[5] = 300;
-							_vm->_gnapIdleFacing = kDirUpLeft;
-						} else {
-							_vm->_isLeavingScene = true;
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107BC, 1);
-							_vm->_gnapActionStatus = kAS04LeaveScene;
-							_vm->_newSceneNum = 38;
-						}
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04ExitTruck:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, 0x107AE, 1);
-				_vm->_gnapActionStatus = kAS04LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, -1, 0x107C7, 1);
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 2;
-				else
-					_vm->_newSceneNum = 33;
-			}
-			break;
-		
-		case kHS04Window:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 3);
-				} else if (_vm->isFlag(kGFKeysTaken)) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y, 0, _vm->getGnapSequenceId(gskIdle, 10, 2) | 0x10000, 1)) {
-							if (_triedWindow) {
-								_vm->_gnapActionStatus = kAS04GetKeyAnother;
-							} else {
-								_vm->_gnapActionStatus = kAS04GetKeyFirst;
-								_triedWindow = true;
-							}
-						}
-						break;
-					case GRAB_CURSOR:
-						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[7].x, _vm->_hotspotsWalkPos[7].y);
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-		
-		case kHS04ExitBarn:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y, 0, 0x107AB, 1);
-				_vm->_gnapActionStatus = kAS04LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[8].x, _vm->_hotspotsWalkPos[8].y + 1, -1, 0x107C1, 1);
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 5;
-				else
-					_vm->_newSceneNum = 35;
-			}
-			break;
-		
-		case kHS04WalkArea1:
-		case kHS04WalkArea2:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-			
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-			      	
-		}
-	
-		updateAnimations();
-	
-		if (!_vm->isSoundPlaying(0x1091C))
-			_vm->playSound(0x1091C, true);
-	
-		if (!_vm->_isLeavingScene) {
-			if (_vm->_platypusActionStatus < 0 && _vm->isFlag(kGFPlatypus))
-				_vm->platypusSub426234();
-			if (_vm->_gnapActionStatus < 0)
-				_vm->updateGnapIdleSequence2();
-			if (!_vm->_timers[5]) {
-				_vm->_timers[5] = _vm->getRandom(150) + 300;
-				if (_vm->_gnapActionStatus < 0)
-					_vm->_gameSys->insertSequence(0x20D, 79, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			if (!_vm->_timers[7]) {
-				_vm->_timers[7] = _vm->getRandom(150) + 200;
-				_vm->_gameSys->insertSequence(0x1FC, 59, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			if (!_vm->_timers[6]) {
-				_vm->_timers[6] = _vm->getRandom(20) + 60;
-				if (_nextDogSequenceId == -1)
-					_nextDogSequenceId = 0x210;
-			}
-			if (!_vm->_timers[8]) {
-				_vm->_timers[8] = _vm->getRandom(150) + 400;
-				_vm->_gameSys->insertSequence(0x213, 20, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			_vm->playSoundC();
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene04::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS04LeaveScene:
-			_vm->_sceneDone = true;
-			break;
-		case kAS04OpenDoor:
-			_vm->_gameSys->insertSequence(0x205, _vm->_gnapId, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x207, 121, 521, 121, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapX = 6;
-			_vm->_gnapY = 7;
-			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
-				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
-				kSeqSyncWait, _vm->getSequenceTotalDuration(0x205) - 1, 450 - _vm->_gnapGridX, 336 - _vm->_gnapGridY);
-			_vm->_gameSys->setAnimation(0x107B5, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x7B5;
-			_vm->_gnapSequenceDatNum = 1;
-			_vm->_gnapActionStatus = kAS04OpenDoorDone;
-			break;
-		case kAS04OpenDoorDone:
-			_vm->_gameSys->insertSequence(0x209, 121, 0x207, 121, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS04GetKeyFirst:
-			_vm->_gameSys->insertSequence(0x204, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x204, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x204;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS04GetKeyFirst2;
-			break;
-		case kAS04GetKeyFirst2:
-			_vm->_gameSys->insertSequence(0x206, 255, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x1FF, 256, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x20B, 256, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x20B, 256, 0);
-			_vm->_gnapSequenceId = 0x206;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS04GetKeyFirstDone;
-			break;
-		case kAS04GetKeyFirstDone:
-			_vm->_gameSys->requestRemoveSequence(0x1FF, 256);
-			_vm->_gameSys->requestRemoveSequence(0x20B, 256);
-			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
-				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), 255,
-				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-			_vm->_gnapIdleFacing = kDirBottomRight;
-			_vm->_gnapSequenceId = 0x7B5;
-			_vm->_gnapSequenceDatNum = 1;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS04GetKeyAnother:
-			_vm->_gameSys->insertSequence(0x202, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x202, _vm->_gnapId, 0);
-			_vm->_gnapSequenceId = 0x202;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS04GetKeyAnother2;
-			break;
-		case kAS04GetKeyAnother2:
-			_vm->_gameSys->insertSequence(0x203, 255, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x1FF, 256, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x20A, 256, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0x20A, 256, 0);
-			_vm->_gnapSequenceId = 0x203;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS04GetKeyAnotherDone;
-			break;
-		case kAS04GetKeyAnotherDone:
-			_vm->_gameSys->removeSequence(0x1FF, 256, true);
-			_vm->_gameSys->removeSequence(0x20A, 256, true);
-			_vm->_gameSys->insertSequence(0x107B5, _vm->_gnapId,
-				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), 255,
-				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-			_vm->_gnapSequenceId = 0x7B5;
-			_vm->_gnapSequenceDatNum = 1;
-			_vm->_gnapIdleFacing = kDirBottomRight;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS04GrabDog:
-			_nextDogSequenceId = 0x201;
-			break;
-		case kAS04GrabAxe:
-			_vm->_gameSys->insertSequence(0x211, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->requestRemoveSequence(0x212, 100);
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapSequenceId = 0x211;
-			_vm->_gnapActionStatus = -1;
-			break;
-		default:
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 2);
-		_vm->invAdd(kItemTwig);
-		_vm->setGrabCursorSprite(kItemTwig);
-		_vm->setFlag(kGFTwigTaken);
-		updateHotspots();
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
-		if (_nextDogSequenceId == 0x201) {
-			_vm->_gameSys->insertSequence(_nextDogSequenceId, 139 - _dogIdCtr,
-				_currDogSequenceId, 139 - (_dogIdCtr + 1) % 2,
-				kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x200, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(_nextDogSequenceId, 139 - _dogIdCtr, 3);
-			_dogIdCtr = (_dogIdCtr + 1) % 2;
-			_currDogSequenceId = 0x201;
-			_vm->_gnapSequenceId = 0x200;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = -1;
-			_vm->_timers[6] = _vm->getRandom(20) + 60;
-			_nextDogSequenceId = -1;
-		} else if (_nextDogSequenceId != -1) {
-			_vm->_gameSys->insertSequence(_nextDogSequenceId, 139 - _dogIdCtr,
-				_currDogSequenceId, 139 - (_dogIdCtr + 1) % 2,
-				kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(_nextDogSequenceId, 139 - _dogIdCtr, 3);
-			_dogIdCtr = (_dogIdCtr + 1) % 2;
-			_currDogSequenceId = _nextDogSequenceId;
-			_nextDogSequenceId = -1;
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene04.h b/engines/gnap/scenes/scene04.h
deleted file mode 100644
index 10b6964045..0000000000
--- a/engines/gnap/scenes/scene04.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE04_H
-#define GNAP_SCENE04_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene04: public Scene {
-public:
-	Scene04(GnapEngine *vm);
-	~Scene04() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	bool _triedWindow;
-	int _dogIdCtr;
-	int _nextDogSequenceId;
-	int _currDogSequenceId;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE04_H
diff --git a/engines/gnap/scenes/scene05.cpp b/engines/gnap/scenes/scene05.cpp
deleted file mode 100644
index 8046465cd0..0000000000
--- a/engines/gnap/scenes/scene05.cpp
+++ /dev/null
@@ -1,466 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene05.h"
-
-namespace Gnap {
-
-enum {
-	kHS05Platypus	= 0,
-	kHS05Haystack	= 1,
-	kHS05Padlock	= 2,
-	kHS05Ladder		= 3,
-	kHS05ExitHouse	= 4,
-	kHS05Chicken	= 5,
-	kHS05Device		= 6,
-	kHS05WalkArea1	= 7,
-	kHS05WalkArea2	= 8,
-	kHS05WalkArea3	= 9
-};
-
-enum {
-	kAS05PlatSearchHaystack	= 0,
-	kAS05TryPickPadlock		= 1,
-	kAS05PickPadlock		= 2,
-	kAS05TalkChicken		= 3,
-	kAS05GrabChicken		= 4,
-	kAS05GrabLadder			= 5,
-	kAS05EnterBarn			= 6,
-	kAS05UseTwigWithChicken	= 11,
-	kAS05LeaveScene			= 12
-};
-
-Scene05::Scene05(GnapEngine *vm) : Scene(vm) {
-	_nextChickenSequenceId = -1;
-	_currChickenSequenceId = -1;
-}
-
-int Scene05::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	_vm->_gameSys->setAnimation(0, 0, 1);
-	_vm->_gameSys->setAnimation(0, 0, 3);
-	return _vm->isFlag(kGFBarnPadlockOpen) ? 0x151 : 0x150;
-}
-
-void Scene05::updateHotspots() {
-	_vm->setHotspot(kHS05Platypus, 0, 0, 0, 0, SF_DISABLED | SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS05Haystack, 236, 366, 372, 442, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 7);
-	_vm->setHotspot(kHS05Padlock, 386, 230, 626, 481, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 5, 7);
-	_vm->setHotspot(kHS05Ladder, 108, 222, 207, 444, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
-	_vm->setHotspot(kHS05ExitHouse, 0, 395, 20, 600, SF_EXIT_L_CURSOR | SF_WALKABLE, 0, 8);
-	_vm->setHotspot(kHS05Chicken, 612, 462, 722, 564, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 7, 8);
-	_vm->setHotspot(kHS05WalkArea1, 104, 0, 421, 480);
-	_vm->setHotspot(kHS05WalkArea2, 422, 0, 800, 487);
-	_vm->setHotspot(kHS05WalkArea3, 0, 0, 104, 499);
-	_vm->setDeviceHotspot(kHS05Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS05Platypus]._flags = SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_vm->isFlag(kGFBarnPadlockOpen))
-		_vm->_hotspots[kHS05Padlock]._flags = SF_EXIT_U_CURSOR;
-	_vm->_hotspotsCount = 10;
-}
-
-void Scene05::run() {
-	_vm->playSound(0x1091C, true);
-	_vm->startSoundTimerC(7);
-	
-	_currChickenSequenceId = 0x142;
-	_vm->_gameSys->setAnimation(0x142, 100, 3);
-	_vm->_gameSys->insertSequence(0x142, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_nextChickenSequenceId = -1;
-
-	_vm->_timers[5] = _vm->getRandom(10) + 30;
-	_vm->_timers[6] = _vm->getRandom(150) + 300;
-
-	if (_vm->isFlag(kGFBarnPadlockOpen))
-		_vm->_gameSys->insertSequence(0x14A, 141, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->queueInsertDeviceIcon();
-	
-	if (_vm->_prevSceneNum != 6 && _vm->_prevSceneNum != 36) {
-		_vm->initGnapPos(-1, 8, kDirBottomRight);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(-1, 9, kDirNone);
-		_vm->endSceneInit();
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->platypusWalkTo(2, 8, -1, 0x107C2, 1);
-		_vm->gnapWalkTo(2, 9, -1, 0x107B9, 1);
-	} else {
-		_vm->initGnapPos(6, 8, kDirBottomRight);
-		if (_vm->isFlag(kGFPlatypus))
-			_vm->initPlatypusPos(7, 9, kDirNone);
-		_vm->endSceneInit();
-	}
-	
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-	
-		_vm->testWalk(0, 12, -1, -1, -1, -1);
-	
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS05Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-
-		case kHS05Platypus:
-			if (_vm->_gnapActionStatus < 0 && _vm->isFlag(kGFPlatypus)) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapKissPlatypus(0);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS05Haystack:
-			if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[1].x - 2, _vm->_hotspotsWalkPos[1].y, 4, 5);
-				} else if (_vm->isFlag(kGFNeedleTaken)) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y - 1);
-						break;
-					case GRAB_CURSOR:
-					case TALK_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					case PLAT_CURSOR:
-						if (_vm->isFlag(kGFPlatypus)) {
-							_vm->gnapUseDeviceOnPlatypuss();
-							if (_vm->platypusWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 1, 0x107C2, 1)) {
-								_vm->_platypusActionStatus = kAS05PlatSearchHaystack;
-								_vm->_platypusFacing = kDirUnk4;
-							}
-							if (_vm->_gnapX == 4 && (_vm->_gnapY == 8 || _vm->_gnapY == 7))
-								_vm->gnapWalkStep();
-							_vm->playGnapIdle(_vm->_platX, _vm->_platY);
-						}
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS05Chicken:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemTwig) {
-					_vm->_gnapIdleFacing = kDirUpRight;
-					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1,
-						0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-					_vm->_gnapActionStatus = kAS05UseTwigWithChicken;
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y + 1, 9, 7);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(9, 7);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS05GrabChicken;
-						break;
-					case TALK_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[5].x, _vm->_hotspotsWalkPos[5].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS05TalkChicken;
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS05Ladder:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 2, 5);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapMoan2(2, 4);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirBottomLeft;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS05GrabLadder;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS05Padlock:
-			if (_vm->isFlag(kGFBarnPadlockOpen)) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x - 1, _vm->_hotspotsWalkPos[2].y + 1, 0, -1, 1);
-				_vm->_gnapActionStatus = kAS05EnterBarn;
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 6;
-				else
-					_vm->_newSceneNum = 36;
-			} else if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemNeedle) {
-					if (_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0,
-						_vm->getGnapSequenceId(gskIdle, _vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y) | 0x10000, 1))
-						_vm->_gnapActionStatus = kAS05PickPadlock;
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 7, 4);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(7, 4);
-						break;
-					case GRAB_CURSOR:
-						_vm->_gnapIdleFacing = kDirUpRight;
-						_vm->gnapWalkTo(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y,
-							0, _vm->getGnapSequenceId(gskIdle, 0, 0) | 0x10000, 1);
-						_vm->_gnapActionStatus = kAS05TryPickPadlock;
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS05ExitHouse:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AF, 1);
-				_vm->_gnapActionStatus = kAS05LeaveScene;
-				if (_vm->isFlag(kGFPlatypus))
-					_vm->platypusWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y + 1, -1, 0x107C7, 1);
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 4;
-				else
-					_vm->_newSceneNum = 37;
-			}
-			break;
-
-		case kHS05WalkArea1:
-		case kHS05WalkArea2:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-			
-		case kHS05WalkArea3:
-			// Nothing
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-		
-		}
-	
-		updateAnimations();
-	
-		if (!_vm->isSoundPlaying(0x1091C))
-			_vm->playSound(0x1091C, true);
-	
-		if (!_vm->_isLeavingScene) {
-			if (_vm->isFlag(kGFPlatypus))
-				_vm->updatePlatypusIdleSequence();
-			_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[5]) {
-				_vm->_timers[5] = _vm->getRandom(20) + 30;
-				if (_vm->_gnapActionStatus != kAS05TalkChicken && _nextChickenSequenceId == -1) {
-					if (_vm->getRandom(4) != 0)
-						_nextChickenSequenceId = 0x142;
-					else
-						_nextChickenSequenceId = 0x143;
-				}
-			}
-			if (!_vm->_timers[6]) {
-				_vm->_timers[6] = _vm->getRandom(150) + 300;
-				if (_vm->_gnapActionStatus < 0)
-					_vm->_gameSys->insertSequence(0x149, 39, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			_vm->playSoundC();
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-			_vm->_timers[5] = _vm->getRandom(20) + 30;
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene05::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS05LeaveScene:
-			_vm->_sceneDone = true;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS05TryPickPadlock:
-			_vm->_gameSys->insertSequence(0x148, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0x148;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS05PickPadlock:
-			_vm->_gameSys->setAnimation(0x147, _vm->_gnapId, 0);
-			_vm->_gameSys->insertSequence(0x147, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0x147;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->setFlag(kGFBarnPadlockOpen);
-			_vm->setFlag(kGFSceneFlag1);
-			_vm->setGrabCursorSprite(-1);
-			_vm->_newSceneNum = 6;
-			_vm->_timers[2] = 100;
-			_vm->invRemove(kItemNeedle);
-			_vm->_gnapActionStatus = kAS05LeaveScene;
-			break;
-		case kAS05TalkChicken:
-			_nextChickenSequenceId = 0x144;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS05GrabChicken:
-			_nextChickenSequenceId = 0x14B;
-			break;
-		case kAS05GrabLadder:
-			while (_vm->_gameSys->isSequenceActive(0x149, 39))
-				_vm->gameUpdateTick();
-			_vm->_gameSys->insertSequence(0x14E, _vm->_gnapId + 1, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x14D, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0x14D;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_timers[2] = 200;
-			_vm->_timers[6] = 300;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS05EnterBarn:
-			_vm->_gameSys->insertSequence(0x107B1, 1,
-				makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
-				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-			_vm->_gameSys->setAnimation(0x107B1, 1, 0);
-			_vm->_gnapActionStatus = kAS05LeaveScene;
-			break;
-		case kAS05UseTwigWithChicken:
-			_vm->playGnapShowItem(5, 0, 0);
-			_nextChickenSequenceId = 0x14F;
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
-		if (_vm->_platypusSequenceId == 0x146) {
-			_vm->_platX = 4;
-			_vm->_platY = 8;
-			_vm->_gameSys->insertSequence(0x107C1, 160, 0x146, 256, kSeqSyncWait, 0, 300 - _vm->_platGridX, 384 - _vm->_platGridY);
-			_vm->_platypusSequenceId = 0x7C1;
-			_vm->_platypusSequenceDatNum = 1;
-			_vm->_platypusId = 20 * _vm->_platY;
-			_vm->invAdd(kItemNeedle);
-			_vm->setFlag(kGFNeedleTaken);
-			_vm->setGrabCursorSprite(kItemNeedle);
-			_vm->showCursor();
-			_vm->_timers[1] = 30;
-			_vm->_platypusActionStatus = -1;
-		}
-		if (_vm->_platypusActionStatus == kAS05PlatSearchHaystack) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_vm->_gameSys->insertSequence(0x145, _vm->_platypusId, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x146, 256, 0x145, _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
-			_vm->hideCursor();
-			_vm->setGrabCursorSprite(-1);
-			_vm->_platypusSequenceId = 0x146;
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_gameSys->setAnimation(0x146, 256, 1);
-			_vm->_timers[1] = 300;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
-		if (_nextChickenSequenceId == 0x14B) {
-			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 100, 3);
-			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 100, _currChickenSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x14C, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapSequenceId = 0x14C;
-			_currChickenSequenceId = _nextChickenSequenceId;
-			_nextChickenSequenceId = -1;
-			_vm->_gnapActionStatus = -1;
-		} else if (_nextChickenSequenceId != -1) {
-			_vm->_gameSys->setAnimation(_nextChickenSequenceId, 100, 3);
-			_vm->_gameSys->insertSequence(_nextChickenSequenceId, 100, _currChickenSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			_currChickenSequenceId = _nextChickenSequenceId;
-			_nextChickenSequenceId = -1;
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene05.h b/engines/gnap/scenes/scene05.h
deleted file mode 100644
index a3be46b009..0000000000
--- a/engines/gnap/scenes/scene05.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE05_H
-#define GNAP_SCENE05_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene05: public Scene {
-public:
-	Scene05(GnapEngine *vm);
-	~Scene05() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	int _nextChickenSequenceId;
-	int _currChickenSequenceId;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE05_H
diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp
deleted file mode 100644
index aae5125bb7..0000000000
--- a/engines/gnap/scenes/scene06.cpp
+++ /dev/null
@@ -1,446 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene06.h"
-
-namespace Gnap {
-
-enum {
-	kHS06Platypus			= 0,
-	kHS06Gas				= 1,
-	kHS06Ladder				= 2,
-	kHS06Horse				= 3,
-	kHS06ExitOutsideBarn	= 4,
-	kHS06Device				= 5,
-	kHS06WalkArea1			= 6,
-	kHS06WalkArea2			= 7,
-	kHS06WalkArea3			= 8,
-	kHS06WalkArea4			= 9,
-	kHS06WalkArea5			= 10
-};
-
-enum {
-	kAS06TryToGetGas			= 0,
-	kAS06TryToClimbLadder		= 1,
-	kAS06TryToClimbLadderDone	= 2,
-	kAS06TalkToHorse			= 3,
-	kAS06UseTwigOnHorse			= 4,
-	kAS06LeaveScene				= 5
-};
-
-Scene06::Scene06(GnapEngine *vm) : Scene(vm) {
-	_horseTurnedBack = false;;
-	_nextPlatSequenceId = -1;
-	_nextHorseSequenceId = -1;
-	_currHorseSequenceId = -1;
-}
-
-int Scene06::init() {
-	_vm->_gameSys->setAnimation(0, 0, 0);
-	_vm->_gameSys->setAnimation(0, 0, 1);
-	_vm->_gameSys->setAnimation(0, 0, 2);
-	if (_vm->isFlag(kGFSceneFlag1)) {
-		_vm->playSound(0x11B, false);
-		_vm->clearFlag(kGFSceneFlag1);
-	}
-	return 0x101;
-}
-
-void Scene06::updateHotspots() {
-	_vm->setHotspot(kHS06Platypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS06Gas, 300, 120, 440, 232, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
-	_vm->setHotspot(kHS06Ladder, 497, 222, 614, 492, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 6, 8);
-	_vm->setHotspot(kHS06Horse, 90, 226, 259, 376, SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR, 4, 7);
-	_vm->setHotspot(kHS06ExitOutsideBarn, 226, 580, 688, 600, SF_EXIT_D_CURSOR | SF_WALKABLE, 5, 10);
-	_vm->setHotspot(kHS06WalkArea1, 0, 0, 200, 515);
-	_vm->setHotspot(kHS06WalkArea2, 200, 0, 285, 499);
-	_vm->setHotspot(kHS06WalkArea3, 688, 0, 800, 499);
-	_vm->setHotspot(kHS06WalkArea4, 475, 469, 800, 505);
-	_vm->setHotspot(kHS06WalkArea5, 0, 0, 800, 504);
-	_vm->setDeviceHotspot(kHS06Device, -1, -1, -1, -1);
-    if (_vm->isFlag(kGFGasTaken)) 
-    	_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
-	if (_vm->_cursorValue == 4) {
-		_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
-		_vm->_hotspots[kHS06Gas]._flags = SF_DISABLED;
-	}
-	_vm->_hotspotsCount = 11;
-}
-
-void Scene06::run() {
-	bool triedDeviceOnGas = false;
-	
-	_vm->startSoundTimerC(7);
-
-	_horseTurnedBack = false;
-	_vm->_gameSys->insertSequence(0xF1, 120, 0, 0, kSeqNone, 0, 0, 0);
-
-	_currHorseSequenceId = 0xF1;
-	_nextHorseSequenceId = -1;
-
-	_vm->_gameSys->setAnimation(0xF1, 120, 2);
-	_vm->_timers[4] = _vm->getRandom(40) + 25;
-
-	if (_vm->isFlag(kGFUnk04))
-		_vm->_gameSys->insertSequence(0xF7, 20, 0, 0, kSeqNone, 0, 0, 0);
-	else
-		_vm->_gameSys->insertSequence(0xF8, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!_vm->isFlag(kGFGasTaken) && _vm->_cursorValue != 4)
-		_vm->_gameSys->insertSequence(0xFE, 20, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->queueInsertDeviceIcon();
-	
-	_vm->initGnapPos(5, 12, kDirBottomRight);
-	_vm->initPlatypusPos(6, 12, kDirNone);
-	_vm->endSceneInit();
-	
-	_vm->platypusWalkTo(6, 8, -1, 0x107C2, 1);
-	_vm->gnapWalkTo(5, 8, -1, 0x107B9, 1);
-	
-	while (!_vm->_sceneDone) {
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-		
-		_vm->testWalk(0, 5, -1, -1, -1, -1);
-	
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS06Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-			}
-			break;
-		
-		case kHS06Platypus:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemDisguise) {
-					_vm->gnapUseDisguiseOnPlatypus();
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapImpossible(0, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						if (_vm->isFlag(kGFKeysTaken))
-							_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-						else
-							_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-						break;
-					case GRAB_CURSOR:
-						_vm->gnapKissPlatypus(0);
-						break;
-					case TALK_CURSOR:
-						_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-						_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-						break;
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS06Gas:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 5, 0);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(5, 0);
-						break;
-					case GRAB_CURSOR:
-						if (_vm->isFlag(kGFUnk04)) {
-							_vm->playGnapImpossible(0, 0);
-						} else if (triedDeviceOnGas) {
-							_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y, 0, 0x107BC, 1);
-							_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
-							_vm->_gnapActionStatus = kAS06TryToGetGas;
-						} else {
-							triedDeviceOnGas = true;
-							_vm->playGnapPullOutDeviceNonWorking(_vm->_hotspotsWalkPos[1].x, _vm->_hotspotsWalkPos[1].y);
-						}
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						if (_vm->isFlag(kGFUnk04))
-							_vm->playGnapImpossible(0, 0);
-						else
-							_vm->playGnapScratchingHead(5, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS06Ladder:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 8, 4);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(8, 4);
-						break;
-					case GRAB_CURSOR:
-						if (_vm->isFlag(kGFGasTaken))
-							_vm->playGnapImpossible(0, 0);
-						else {
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, 0, 0x107BB, 1);
-							_vm->_gnapActionStatus = kAS06TryToClimbLadder;
-							_vm->setFlag(kGFGasTaken);
-						}
-						break;
-					case TALK_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS06Horse:
-			if (_vm->_gnapActionStatus < 0) {
-				if (_vm->_grabCursorSpriteIndex == kItemTwig && _horseTurnedBack) {
-					_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
-					_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, 0x107BC, 1);
-					_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
-					_vm->_gnapIdleFacing = kDirUpLeft;
-					_vm->platypusWalkTo(6, 8, 1, 0x107C2, 1);
-					_vm->_platypusFacing = kDirNone;
-					_vm->_gnapActionStatus = kAS06UseTwigOnHorse;
-					_vm->setGrabCursorSprite(-1);
-				} else if (_vm->_grabCursorSpriteIndex >= 0) {
-					_vm->playGnapShowCurrItem(_vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].x, _vm->_hotspotsWalkPos[_vm->_sceneClickedHotspot].y, 3, 2);
-				} else {
-					switch (_vm->_verbCursor) {
-					case LOOK_CURSOR:
-						_vm->playGnapScratchingHead(3, 2);
-						break;
-					case TALK_CURSOR:
-						if (_horseTurnedBack) {
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 3, 2) | 0x10000, 1);
-						} else {
-							_vm->_gnapIdleFacing = kDirBottomLeft;
-							_vm->_hotspots[kHS06WalkArea5]._flags |= SF_WALKABLE;
-							_vm->gnapWalkTo(_vm->_hotspotsWalkPos[3].x, _vm->_hotspotsWalkPos[3].y, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
-							_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
-							_vm->_gnapActionStatus = kAS06TalkToHorse;
-						}
-						break;
-					case GRAB_CURSOR:
-					case PLAT_CURSOR:
-						_vm->playGnapImpossible(0, 0);
-						break;
-					}
-				}
-			}
-			break;
-
-		case kHS06ExitOutsideBarn:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->_isLeavingScene = true;
-				_vm->gnapWalkTo(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, 0, 0x107AE, 1);
-				_vm->_gnapActionStatus = kAS06LeaveScene;
-				if (_vm->_cursorValue == 1)
-					_vm->_newSceneNum = 5;
-				else
-					_vm->_newSceneNum = 35;
-			}
-			break;
-
-		case kHS06WalkArea1:
-		case kHS06WalkArea2:
-		case kHS06WalkArea3:
-		case kHS06WalkArea4:
-		case kHS06WalkArea5:
-			if (_vm->_gnapActionStatus < 0)
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left && _vm->_gnapActionStatus < 0) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-
-		}
-
-		updateAnimations();
-	
-		if (!_vm->_isLeavingScene) {
-			if (_vm->_platypusActionStatus < 0)
-				_vm->updatePlatypusIdleSequence();
-			if (_vm->_gnapActionStatus < 0)
-				_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[4]) {
-				_vm->_timers[4] = _vm->getRandom(40) + 25;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextHorseSequenceId == -1) {
-					if (_horseTurnedBack) {
-						_nextHorseSequenceId = 0xF5;
-					} else {
-						switch (_vm->getRandom(5)) {
-						case 0:
-						case 1:
-						case 2:
-							_nextHorseSequenceId = 0xF1;
-							break;
-						case 3:
-							_nextHorseSequenceId = 0xF3;
-							break;
-						case 4:
-							_nextHorseSequenceId = 0xF4;
-							break;
-						}
-					}
-				}
-			}
-			_vm->playSoundC();
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene06::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS06LeaveScene:
-			_vm->_sceneDone = true;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS06TryToGetGas:
-			_vm->_gameSys->insertSequence(0xFC, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0xFC;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS06TryToClimbLadder:
-			_vm->_gameSys->insertSequence(0xFF, 20, 0xFE, 20, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->setAnimation(0xFD, _vm->_gnapId, 0);
-			_vm->_gameSys->insertSequence(0xFD, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gnapSequenceId = 0xFD;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapActionStatus = kAS06TryToClimbLadderDone;
-			break;
-		case kAS06TryToClimbLadderDone:
-			_vm->_gnapX = 6;
-			_vm->_gnapY = 7;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS06TalkToHorse:
-			_nextHorseSequenceId = 0xF6;
-			break;
-		case kAS06UseTwigOnHorse:
-			_nextPlatSequenceId = 0xFB;
-			break;
-		default:
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 1);
-		if (_vm->_platypusSequenceId == 0xFA) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_vm->invAdd(kItemGas);
-			_vm->setFlag(kGFGasTaken);
-			_vm->_hotspots[kHS06Ladder]._flags = SF_DISABLED;
-			_vm->setGrabCursorSprite(kItemGas);
-			_vm->_platypusActionStatus = -1;
-			_vm->_platX = 6;
-			_vm->_platY = 8;
-			_vm->_gameSys->insertSequence(0x107C1, _vm->_platypusId, 0, 0, kSeqNone, 0, 450 - _vm->_platGridX, 384 - _vm->_platGridY);
-			_vm->_platypusSequenceId = 0x7C1;
-			_vm->_platypusSequenceDatNum = 1;
-			_vm->setFlag(kGFUnk04);
-			_vm->_gnapActionStatus = -1;
-			_vm->showCursor();
-		}
-		if (_nextPlatSequenceId == 0xFB) {
-			_vm->_gameSys->setAnimation(0, 0, 1);
-			_nextHorseSequenceId = 0xF2;
-			_vm->_platypusActionStatus = 6;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextHorseSequenceId != -1) {
-		switch (_nextHorseSequenceId) {
-		case 0xF2:
-			_vm->setGrabCursorSprite(-1);
-			_vm->hideCursor();
-			_vm->_gameSys->setAnimation(0xFA, 256, 1);
-			_vm->_gameSys->insertSequence(0xF2, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x100, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0xF7, 20, 0xF8, 20, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0xFB, _vm->_platypusId, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0xFA, 256, 0xFB, _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
-			_vm->_platypusSequenceId = 0xFA;
-			_vm->_platypusSequenceDatNum = 0;
-			_vm->_gameSys->insertSequence(0x107B7, _vm->_gnapId, 0x100, _vm->_gnapId,
-				kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-			_vm->_gnapSequenceId = 0x7B7;
-			_vm->_gnapSequenceDatNum = 1;
-			_currHorseSequenceId = _nextHorseSequenceId;
-			_nextHorseSequenceId = -1;
-			_nextPlatSequenceId = -1;
-			_vm->invRemove(kItemTwig);
-			break;
-		case 0xF6:
-			_vm->_gameSys->setAnimation(_nextHorseSequenceId, 120, 2);
-			_vm->_gameSys->insertSequence(0xF6, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
-			_horseTurnedBack = true;
-			_currHorseSequenceId = _nextHorseSequenceId;
-			_nextHorseSequenceId = -1;
-			_vm->_gnapActionStatus = -1;
-			break;
-		default:
-			_vm->_gameSys->setAnimation(_nextHorseSequenceId, 120, 2);
-			_vm->_gameSys->insertSequence(_nextHorseSequenceId, 120, _currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
-			_currHorseSequenceId = _nextHorseSequenceId;
-			_nextHorseSequenceId = -1;
-			break;
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene06.h b/engines/gnap/scenes/scene06.h
deleted file mode 100644
index ff6ff9f14c..0000000000
--- a/engines/gnap/scenes/scene06.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE06_H
-#define GNAP_SCENE06_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene06: public Scene {
-public:
-	Scene06(GnapEngine *vm);
-	~Scene06() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-
-private:
-	bool _horseTurnedBack;
-	int _nextPlatSequenceId;
-	int _nextHorseSequenceId;
-	int _currHorseSequenceId;
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE06_H
diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp
deleted file mode 100644
index 41ddf4caf1..0000000000
--- a/engines/gnap/scenes/scene07.cpp
+++ /dev/null
@@ -1,271 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-
-#include "gnap/scenes/scene07.h"
-
-namespace Gnap {
-
-enum {
-	kHS07Platypus	= 0,
-	kHS07ExitHouse	= 1,
-	kHS07Dice		= 2,
-	kHS07Device		= 3,
-	kHS07WalkArea1	= 4,
-	kHS07WalkArea2	= 5,
-	kHS07WalkArea3	= 6
-};
-
-enum {
-	kAS07Wait		= 0,
-	kAS07LeaveScene	= 1
-};
-
-Scene07::Scene07(GnapEngine *vm) : Scene(vm) {
-}
-
-int Scene07::init() {
-	return 0x92;
-}
-
-void Scene07::updateHotspots() {
-	_vm->setHotspot(kHS07Platypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS07ExitHouse, 700, 125, 799, 290, SF_EXIT_NE_CURSOR);
-	_vm->setHotspot(kHS07Dice, 200, 290, 270, 360, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS07WalkArea1, 0, 0, 325, 445);
-	_vm->setHotspot(kHS07WalkArea2, 325, 0, 799, 445, _vm->_isLeavingScene ? SF_WALKABLE : SF_NONE);
-	_vm->setHotspot(kHS07WalkArea3, 160, 0, 325, 495);
-	_vm->setDeviceHotspot(kHS07Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFPlatypus))
-		_vm->_hotspots[kHS07Dice]._flags = SF_DISABLED;
-	_vm->_hotspotsCount = 7;
-}
-
-void Scene07::run() {
-	_vm->queueInsertDeviceIcon();
-	_vm->_gameSys->insertSequence(0x8C, 1, 0, 0, kSeqLoop, 0, 0, 0);
-	_vm->_gameSys->insertSequence(0x90, 1, 0, 0, kSeqLoop, 0, 0, 0);
-
-	_vm->invRemove(kItemGas);
-	_vm->invRemove(kItemNeedle);
-	
-	if (!_vm->isFlag(kGFPlatypus))
-		_vm->_gameSys->insertSequence(0x8D, 1, 0, 0, kSeqNone, 0, 0, 0);
-
-	if (_vm->_prevSceneNum == 8) {
-		_vm->initGnapPos(7, 7, kDirBottomLeft);
-		_vm->initPlatypusPos(9, 7, kDirUnk4);
-		_vm->endSceneInit();
-	} else {
-		_vm->_gnapX = 6;
-		_vm->_gnapY = 7;
-		_vm->_gnapId = 140;
-		_vm->_gnapSequenceId = 0x8F;
-		_vm->_gnapSequenceDatNum = 0;
-		_vm->_gnapIdleFacing = kDirBottomRight;
-		_vm->_gameSys->insertSequence(0x8F, 140, 0, 0, kSeqNone, 0, 0, 0);
-		_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
-		_vm->_gnapActionStatus = kAS07Wait;
-		_vm->_platX = 3;
-		_vm->_platY = 8;
-		_vm->_platypusId = 160;
-		_vm->_platypusSequenceId = 0x91;
-		_vm->_platypusSequenceDatNum = 0;
-		_vm->_platypusFacing = kDirNone;
-		_vm->_gameSys->insertSequence(0x91, 160, 0, 0, kSeqNone, 0, 0, 0);
-		_vm->endSceneInit();
-	}
-
-	_vm->_timers[3] = 600;
-	_vm->_timers[4] = _vm->getRandom(40) + 50;
-
-	while (!_vm->_sceneDone) {
-		if (!_vm->isSoundPlaying(0x10919))
-			_vm->playSound(0x10919, true);
-
-		if (_vm->testWalk(0, 1, 8, 7, 6, 7))
-			updateHotspots();
-
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS07Platypus:
-			switch (_vm->_verbCursor) {
-			case LOOK_CURSOR:
-				_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-				break;
-			case GRAB_CURSOR:
-				_vm->gnapKissPlatypus(0);
-				break;
-			case TALK_CURSOR:
-				_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-				_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-				break;
-			case PLAT_CURSOR:
-				break;
-			}
-			break;
-
-		case kHS07ExitHouse:
-			_vm->_isLeavingScene = true;
-			if (_vm->_gnapX > 8)
-				_vm->gnapWalkTo(_vm->_gnapX, 7, 0, 0x107AD, 1);
-			else
-				_vm->gnapWalkTo(8, 7, 0, 0x107AD, 1);
-			_vm->_gnapActionStatus = kAS07LeaveScene;
-			break;
-
-		case kHS07Dice:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(4, 8, 3, 3);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					break;
-				case GRAB_CURSOR:
-					_vm->setFlag(kGFPlatypus);
-					_vm->invAdd(kItemDice);
-					updateHotspots();
-					_vm->playGnapPullOutDevice(3, 3);
-					_vm->_gameSys->setAnimation(0x8E, 1, 2);
-					_vm->_gameSys->insertSequence(0x8E, 1, 141, 1, kSeqSyncWait, 0, 0, 0);
-					_vm->_gameSys->insertSequence(_vm->getGnapSequenceId(gskUseDevice, 0, 0) | 0x10000, _vm->_gnapId,
-						makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId,
-						kSeqSyncWait, 0, 75 * _vm->_gnapX - _vm->_gnapGridX, 48 * _vm->_gnapY - _vm->_gnapGridY);
-					_vm->_gnapSequenceId = _vm->getGnapSequenceId(gskUseDevice, 0, 0);
-					_vm->_gnapSequenceDatNum = 1;
-					break;
-				case TALK_CURSOR:
-				case PLAT_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				}
-			}
-			break;
-
-		case kHS07Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-				_vm->_timers[4] = _vm->getRandom(40) + 50;
-			}
-			break;
-
-		case kHS07WalkArea1:
-		case kHS07WalkArea2:
-			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-			
-		case kHS07WalkArea3:
-			// Nothing
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-		}
-
-		updateAnimations();
-
-		if (!_vm->_isLeavingScene) {
-			_vm->updateGnapIdleSequence();
-			if (_vm->_platypusActionStatus < 0 && _vm->_gnapActionStatus < 0) {
-				if (_vm->_timers[0]) {
-					if (!_vm->_timers[1]) {
-						_vm->_timers[1] = _vm->getRandom(20) + 30;
-						int gnapRandomValue = _vm->getRandom(20);
-						// TODO Cleanup
-						if (_vm->_platypusFacing != kDirNone) {
-							if (gnapRandomValue != 0 || _vm->_platypusSequenceId != 0x7CA) {
-								if (gnapRandomValue != 1 || _vm->_platypusSequenceId != 0x7CA) {
-									if (_vm->_platY == 9)
-										_vm->playPlatypusSequence(0x107CA);
-								} else {
-									_vm->playPlatypusSequence(0x10845);
-								}
-							} else {
-								_vm->playPlatypusSequence(0x107CC);
-							}
-						} else if (gnapRandomValue != 0 || _vm->_platypusSequenceId != 0x7C9) {
-							if (gnapRandomValue != 1 || _vm->_platypusSequenceId != 0x7C9) {
-								if (_vm->_platY == 9)
-									_vm->playPlatypusSequence(0x107C9);
-							} else {
-								_vm->playPlatypusSequence(0x10844);
-							}
-						} else {
-							_vm->playPlatypusSequence(0x107CB);
-						}
-						_vm->_gameSys->setAnimation(_vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, 1);
-					}
-				} else {
-					_vm->_timers[0] = _vm->getRandom(75) + 75;
-					_vm->platypusMakeRoom();
-				}
-			} else {
-				_vm->_timers[0] = 100;
-				_vm->_timers[1] = 35;
-			}
-			playRandomSound(4);
-		}
-
-		_vm->checkGameKeys();
-
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-			_vm->_timers[4] = _vm->getRandom(40) + 50;
-		}
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene07::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS07LeaveScene:
-			_vm->_newSceneNum = 8;
-			_vm->_sceneDone = true;
-			break;
-		}
-		_vm->_gnapActionStatus = -1;
-	}
-
-	if (_vm->_gameSys->getAnimationStatus(2) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 2);
-		_vm->setGrabCursorSprite(kItemDice);
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene07.h b/engines/gnap/scenes/scene07.h
deleted file mode 100644
index 1afc1f8f12..0000000000
--- a/engines/gnap/scenes/scene07.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE07_H
-#define GNAP_SCENE07_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene07: public Scene {
-public:
-	Scene07(GnapEngine *vm);
-	~Scene07() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-};
-
-} // End of namespace Gnap
-
-#endif // GNAP_SCENE07_H
diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp
deleted file mode 100644
index 2b977a481e..0000000000
--- a/engines/gnap/scenes/scene08.cpp
+++ /dev/null
@@ -1,527 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene08.h"
-
-namespace Gnap {
-
-enum {
-	kH08SPlatypus	= 0,
-	kHS08ExitBackdoor	= 1,
-	kHS08ExitCrash	= 2,
-	kHS08Man		= 3,
-	kHS08Door		= 4,
-	kHS08Meat		= 5,
-	kHS08Bone		= 6,
-	kHS08Toy		= 7,
-	kHS08WalkArea1	= 8,
-	kHS08Device		= 9,
-	kHS08WalkArea2	= 10
-};
-
-enum {
-	kAS08LeaveScene		= 0,
-	kAS08TalkMan		= 1,
-	kAS08LookMan		= 2,
-	kAS08LookDog		= 3,
-	kAS08GrabDog		= 4,
-	kAS08TalkDog		= 5,
-	kAS08PlatWithMan	= 6,
-	kAS08PlatWithDog	= 7
-};
-
-Scene08::Scene08(GnapEngine *vm) : Scene(vm) {
-	_nextDogSequenceId = -1;
-	_currDogSequenceId = -1;
-	_nextManSequenceId = -1;
-	_currManSequenceId = -1;
-}
-
-int Scene08::init() {
-	return 0x150;
-}
-
-void Scene08::updateHotspots() {
-	_vm->setHotspot(kH08SPlatypus, 0, 0, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08ExitBackdoor, 0, 280, 10, 400, SF_EXIT_L_CURSOR | SF_WALKABLE);
-	_vm->setHotspot(kHS08ExitCrash, 200, 590, 400, 599, SF_EXIT_D_CURSOR | SF_WALKABLE);
-	_vm->setHotspot(kHS08Man, 510, 150, 610, 380, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08Door, 350, 170, 500, 410, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08Meat, 405, 450, 480, 485, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08Bone, 200, 405, 270, 465, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08Toy, 540, 430, 615, 465, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS08WalkArea1, 290, 340, -1, -1);
-	_vm->setHotspot(kHS08WalkArea2, 0, 0, 799, 420);
-	_vm->setDeviceHotspot(kHS08Device, -1, -1, -1, -1);
-	if (_vm->isFlag(kGFBarnPadlockOpen))
-		_vm->_hotspots[kHS08Meat]._flags = SF_WALKABLE | SF_DISABLED;
-	if (_vm->isFlag(kGFTruckFilledWithGas))
-		_vm->_hotspots[kHS08Bone]._flags = SF_WALKABLE | SF_DISABLED;
-	if (_vm->isFlag(kGFTruckKeysUsed))
-		_vm->_hotspots[kHS08Toy]._flags = SF_WALKABLE | SF_DISABLED;
-	_vm->_hotspotsCount = 11;
-}
-
-void Scene08::updateAnimationsCb() {
-	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
-		_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
-		_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-		_currDogSequenceId = _nextDogSequenceId;
-		if ( _nextDogSequenceId != 0x135 )
-			_nextDogSequenceId = 0x134;
-	}
-}
-
-void Scene08::run() {
-	_vm->queueInsertDeviceIcon();
-
-	_vm->_gameSys->insertSequence(0x14F, 1, 0, 0, kSeqLoop, 0, 0, 0);
-	_vm->_gameSys->insertSequence(0x14E, 256, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_currDogSequenceId = 0x135;
-	_nextDogSequenceId = 0x135;
-	
-	_vm->_gameSys->setAnimation(0x135, 100, 3);
-	_vm->_gameSys->insertSequence(_currDogSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_currManSequenceId = 0x140;
-	_nextManSequenceId = -1;
-	
-	_vm->_gameSys->setAnimation(0x140, 100, 2);
-	_vm->_gameSys->insertSequence(_currManSequenceId, 100, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->_timers[4] = _vm->getRandom(50) + 75;
-	
-	if (!_vm->isFlag(kGFBarnPadlockOpen))
-		_vm->_gameSys->insertSequence(0x144, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!_vm->isFlag(kGFTruckFilledWithGas))
-		_vm->_gameSys->insertSequence(0x145, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (!_vm->isFlag(kGFTruckKeysUsed))
-		_vm->_gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
-	
-	_vm->initGnapPos(-1, 8, kDirBottomRight);
-	_vm->initPlatypusPos(-1, 7, kDirNone);
-	
-	_vm->endSceneInit();
-	
-	_vm->gnapWalkTo(1, 8, -1, 0x107B9, 1);
-	_vm->platypusWalkTo(1, 7, -1, 0x107C2, 1);
-	
-	_vm->_timers[5] = _vm->getRandom(40) + 50;
-	
-	while (!_vm->_sceneDone) {	
-		if (!_vm->isSoundPlaying(0x10919))
-			_vm->playSound(0x10919, true);
-	
-		_vm->testWalk(0, 0, -1, -1, -1, -1);
-		
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS08Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-				_vm->_timers[4] = _vm->getRandom(50) + 75;
-				_vm->_timers[5] = _vm->getRandom(40) + 50;
-			}
-			break;
-
-		case kH08SPlatypus:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapImpossible(0, 0);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					if (_vm->isFlag(kGFSceneFlag1))
-						_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-					else
-						_vm->playGnapScratchingHead(_vm->_platX, _vm->_platY);
-					break;
-				case GRAB_CURSOR:
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapKissPlatypus(8);
-					break;
-				case TALK_CURSOR:
-					_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-					_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-					break;
-				case PLAT_CURSOR:
-					break;
-				}
-			}
-			break;
-
-		case kHS08ExitBackdoor:
-			_vm->_isLeavingScene = true;
-			_vm->gnapActionIdle(0x14D);
-			_vm->gnapWalkTo(0, 6, 0, 0x107AF, 1);
-			_vm->_gnapActionStatus = kAS08LeaveScene;
-			_vm->platypusWalkTo(0, 7, 1, 0x107CF, 1);
-			_vm->_newSceneNum = 9;
-			break;
-
-		case kHS08ExitCrash:
-			_vm->_isLeavingScene = true;
-			_vm->gnapActionIdle(0x14D);
-			_vm->gnapWalkTo(3, 9, 0, 0x107AE, 1);
-			_vm->_gnapActionStatus = kAS08LeaveScene;
-			_vm->platypusWalkTo(4, 9, 1, 0x107C1, 1);
-			_vm->_newSceneNum = 7;
-			break;
-
-		case kHS08Man:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(6, 6, 7, 0);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapWalkTo(6, 6, 0, 0x107BB, 1);
-					_vm->_gnapActionStatus = kAS08LookMan;
-					_vm->_gnapIdleFacing = kDirUpRight;
-					break;
-				case GRAB_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				case TALK_CURSOR:
-					_vm->_gnapIdleFacing = kDirUpLeft;
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapWalkTo(8, 6, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
-					_vm->_gnapActionStatus = kAS08TalkMan;
-					break;
-				case PLAT_CURSOR:
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapUseDeviceOnPlatypuss();
-					_vm->platypusWalkTo(6, 6, 1, 0x107C2, 1);
-					_vm->_platypusActionStatus = kAS08PlatWithMan;
-					_vm->_platypusFacing = kDirNone;
-					_vm->playGnapIdle(6, 6);
-					break;
-				}
-			}
-			break;
-
-		case kHS08Door:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(4, 7, 5, 0);
-				_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
-				_vm->_gnapActionStatus = kAS08GrabDog;
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->playGnapScratchingHead(6, 0);
-					_vm->_gameSys->setAnimation(makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, 0);
-					_vm->_gnapActionStatus = kAS08LookDog;
-					break;
-				case GRAB_CURSOR:
-					_vm->gnapWalkTo(4, 7, 0, 0x107BB, 1);
-					_vm->_gnapActionStatus = kAS08GrabDog;
-					_vm->_gnapIdleFacing = kDirUpRight;
-					break;
-				case TALK_CURSOR:
-					_vm->_gnapIdleFacing = kDirUpRight;
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapWalkTo(4, 7, 0, _vm->getGnapSequenceId(gskBrainPulsating, 0, 0) | 0x10000, 1);
-					_vm->_gnapActionStatus = kAS08TalkDog;
-					break;
-				case PLAT_CURSOR:
-					_vm->setFlag(kGFSceneFlag1);
-					_vm->gnapActionIdle(0x14D);
-					_vm->gnapUseDeviceOnPlatypuss();
-					_vm->platypusWalkTo(3, 7, 1, 0x107C2, 1);
-					_vm->_platypusActionStatus = kAS08PlatWithDog;
-					_vm->_platypusFacing = kDirNone;
-					_vm->playGnapIdle(3, 7);
-					break;
-				}
-			}
-			break;
-
-		case kHS08Meat:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(6, 8, 5, 6);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->playGnapScratchingHead(6, 7);
-					break;
-				case GRAB_CURSOR:
-					if (_currDogSequenceId == 0x135) {
-						_vm->playGnapScratchingHead(6, 7);
-					} else {
-						_vm->gnapActionIdle(0x14D);
-						_vm->playGnapPullOutDevice(6, 7);
-						_vm->playGnapUseDevice(0, 0);
-						_nextDogSequenceId = 0x149;
-					}
-					break;
-				case TALK_CURSOR:
-				case PLAT_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				}
-			}
-			break;
-
-		case kHS08Bone:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(2, 7, 3, 6);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->playGnapScratchingHead(3, 6);
-					break;
-				case GRAB_CURSOR:
-					if (_currDogSequenceId == 0x135) {
-						_vm->playGnapScratchingHead(3, 6);
-					} else {
-						_vm->gnapActionIdle(0x14D);
-						_vm->playGnapPullOutDevice(3, 6);
-						_vm->playGnapUseDevice(0, 0);
-						_nextDogSequenceId = 0x14A;
-					}
-					break;
-				case TALK_CURSOR:
-				case PLAT_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				}
-			}
-			break;
-
-		case kHS08Toy:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(8, 7, 7, 6);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->playGnapScratchingHead(7, 6);
-					break;
-				case GRAB_CURSOR:
-					if (_currDogSequenceId == 0x135) {
-						_vm->playGnapScratchingHead(7, 6);
-					} else {
-						_vm->gnapActionIdle(0x14D);
-						_vm->playGnapPullOutDevice(7, 6);
-						_vm->playGnapUseDevice(0, 0);
-						_nextDogSequenceId = 0x14B;
-					}
-					break;
-				case TALK_CURSOR:
-				case PLAT_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				}
-			}
-			break;
-
-		case kHS08WalkArea1:
-		case kHS08WalkArea2:
-			_vm->gnapActionIdle(0x14D);
-			_vm->gnapWalkTo(-1, 6, -1, -1, 1);
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left) {
-				_vm->gnapActionIdle(0x14D);
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-		}
-	
-		updateAnimations();
-
-		if (!_vm->_isLeavingScene) {
-			_vm->updatePlatypusIdleSequence();
-			_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[4]) {
-				_vm->_timers[4] = _vm->getRandom(50) + 125;
-				if (_vm->_gnapActionStatus < 0 && _vm->_platypusActionStatus < 0 && _nextManSequenceId == -1 &&
-					(_currDogSequenceId == 0x134 || _currDogSequenceId == 0x135)) {
-					int _gnapRandomValue = _vm->getRandom(4);
-					switch (_gnapRandomValue) {
-					case 0:
-						_nextManSequenceId = 0x138;
-						break;
-					case 1:
-						_nextManSequenceId = 0x136;
-						break;
-					case 2:
-						_nextManSequenceId = 0x13B;
-						break;
-					case 3:
-						_nextManSequenceId = 0x13A;
-						break;
-					}
-				}
-			}
-			playRandomSound(5);
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-			_vm->_timers[4] = _vm->getRandom(50) + 75;
-			_vm->_timers[5] = _vm->getRandom(40) + 50;
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene08::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS08LeaveScene:
-			_vm->_sceneDone = true;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS08TalkMan:
-			_nextManSequenceId = 0x13F;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS08LookMan:
-			_nextManSequenceId = 0x140;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS08LookDog:
-			_nextManSequenceId = 0x137;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS08GrabDog:
-			if (_currDogSequenceId == 0x135)
-				_nextDogSequenceId = 0x133;
-			else
-				_nextDogSequenceId = 0x13C;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS08TalkDog:
-			if (_currDogSequenceId == 0x135)
-				_nextDogSequenceId = 0x133;
-			else
-				_nextDogSequenceId = 0x13C;
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(1) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 1);
-		switch (_vm->_platypusActionStatus) {
-		case kAS08PlatWithDog:
-			_nextDogSequenceId = 0x147;
-			break;
-		case kAS08PlatWithMan:
-			_nextManSequenceId = 0x140;
-			_vm->_platypusActionStatus = -1;
-			break;
-		}
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(2) == 2 && _nextManSequenceId != -1) {
-		_vm->_gameSys->setAnimation(_nextManSequenceId, 100, 2);
-		_vm->_gameSys->insertSequence(_nextManSequenceId, 100, _currManSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-		_currManSequenceId = _nextManSequenceId;
-		_nextManSequenceId = -1;
-	}
-	
-	if (_vm->_gameSys->getAnimationStatus(3) == 2) {
-		if (_currDogSequenceId == 0x147)
-			_vm->_platypusActionStatus = -1;
-		if (_currDogSequenceId == 0x149 || _currDogSequenceId == 0x14A || _currDogSequenceId == 0x14B) {
-			if (_vm->getRandom(2) != 0)
-				_nextManSequenceId = 0x13D;
-			else
-				_nextManSequenceId = 0x13E;
-		} else if (_currDogSequenceId == 0x133)
-			_nextManSequenceId = 0x139;
-		if (_nextDogSequenceId == 0x149 || _nextDogSequenceId == 0x14A || _nextDogSequenceId == 0x14B) {
-			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
-			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			switch (_nextDogSequenceId) {
-			case 0x149:
-				_vm->setFlag(kGFBarnPadlockOpen);
-				_vm->_hotspots[kHS08Meat]._flags = SF_DISABLED | SF_WALKABLE;
-				_vm->_gameSys->removeSequence(0x144, 1, true);
-				break;
-			case 0x14A:
-				_vm->setFlag(kGFTruckFilledWithGas);
-				_vm->_hotspots[kHS08Bone]._flags = SF_DISABLED | SF_WALKABLE;
-				_vm->_gameSys->removeSequence(0x145, 1, true);
-				break;
-			case 0x14B:
-				_vm->setFlag(kGFTruckKeysUsed);
-				_vm->_hotspots[kHS08Toy]._flags = SF_DISABLED | SF_WALKABLE;
-				_vm->_gameSys->removeSequence(0x146, 1, true);
-				break;
-			}
-			_currDogSequenceId = _nextDogSequenceId;
-			_nextDogSequenceId = 0x134;
-		} else if (_nextDogSequenceId == 0x147) {
-			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
-			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->insertSequence(0x148, 160, _vm->_platypusSequenceId | (_vm->_platypusSequenceDatNum << 16), _vm->_platypusId, kSeqSyncWait, 0, 0, 0);
-			_currDogSequenceId = _nextDogSequenceId;
-			_nextDogSequenceId = 0x134;
-			_vm->_platX = 1;
-			_vm->_platY = 8;
-			_vm->_platypusId = 160;
-			_vm->_platypusSequenceId = 0x148;
-			_vm->_platypusFacing = kDirUnk4;
-			_vm->_platypusSequenceDatNum = 0;
-			if (_vm->_gnapX == 1 && _vm->_gnapY == 8)
-				_vm->gnapWalkStep();
-		} else if (_nextDogSequenceId != -1) {
-			_vm->_gameSys->setAnimation(_nextDogSequenceId, 100, 3);
-			_vm->_gameSys->insertSequence(_nextDogSequenceId, 100, _currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			_currDogSequenceId = _nextDogSequenceId;
-			if (_nextDogSequenceId != 0x135)
-				_nextDogSequenceId = 0x134;
-			if (_currDogSequenceId == 0x133) {
-				_vm->_timers[2] = _vm->getRandom(30) + 20;
-				_vm->_timers[3] = _vm->getRandom(50) + 200;
-				_vm->_gameSys->insertSequence(0x14D, _vm->_gnapId, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-				_vm->_gnapSequenceId = 0x14D;
-				_vm->_gnapIdleFacing = kDirUpRight;
-				_vm->_gnapSequenceDatNum = 0;
-				_vm->_gnapActionStatus = -1;
-			}
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene08.h b/engines/gnap/scenes/scene08.h
deleted file mode 100644
index b73bc49b22..0000000000
--- a/engines/gnap/scenes/scene08.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE08_H
-#define GNAP_SCENE08_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene08: public Scene {
-public:
-	Scene08(GnapEngine *vm);
-	~Scene08() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb();
-
-private:
-	int _nextDogSequenceId;
-	int _currDogSequenceId;
-	int _nextManSequenceId;
-	int _currManSequenceId;
-};
-
-} // End of namespace Gnap
-#endif // GNAP_SCENE08_H
diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp
deleted file mode 100644
index 7e92ca16ac..0000000000
--- a/engines/gnap/scenes/scene09.cpp
+++ /dev/null
@@ -1,237 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "gnap/gnap.h"
-#include "gnap/gamesys.h"
-#include "gnap/resource.h"
-#include "gnap/scenes/scene09.h"
-
-namespace Gnap {
-
-enum {
-	kHS09Platypus		= 0,
-	kHS09ExitKitchen	= 1,
-	kHS09ExitHouse		= 2,
-	kHS09Trash			= 3,
-	kHS09Device			= 4,
-	kHS09WalkArea1		= 5,
-	kHS09WalkArea2		= 6,
-	kHS09WalkArea3		= 7
-};
-
-enum {
-	kAS09LeaveScene			= 0,
-	kAS09SearchTrash		= 1,
-	kAS09SearchTrashDone	= 2
-};
-
-Scene09::Scene09(GnapEngine *vm) : Scene(vm) {
-}
-
-int Scene09::init() {
-	return 0x4E;
-}
-
-void Scene09::updateHotspots() {
-	_vm->setHotspot(kHS09Platypus, 0, 200, 0, 0, SF_WALKABLE | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS09ExitKitchen, 280, 200, 380, 400, SF_EXIT_U_CURSOR);
-	_vm->setHotspot(kHS09ExitHouse, 790, 200, 799, 450, SF_EXIT_R_CURSOR | SF_WALKABLE);
-	_vm->setHotspot(kHS09Trash, 440, 310, 680, 420, SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR);
-	_vm->setHotspot(kHS09WalkArea1, 0, 0, 799, 400);
-	_vm->setHotspot(kHS09WalkArea2, 0, 0, 630, 450);
-	_vm->setHotspot(kHS09WalkArea2, 0, 0, 175, 495);
-	_vm->setDeviceHotspot(kHS09Device, -1, -1, -1, -1);
-	_vm->_hotspotsCount = 8;
-}
-
-void Scene09::run() {	
-	_vm->queueInsertDeviceIcon();
-	
-	_vm->_gameSys->insertSequence(0x4D, 1, 0, 0, kSeqLoop, 0, 0, 0);
-	_vm->_gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0);
-	
-	if (_vm->_prevSceneNum == 8) {
-		_vm->initGnapPos(11, 8, kDirBottomLeft);
-		_vm->initPlatypusPos(12, 7, kDirUnk4);
-		_vm->endSceneInit();
-		_vm->gnapWalkTo(9, 8, -1, 0x107BA, 1);
-		_vm->platypusWalkTo(9, 7, -1, 0x107D2, 1);
-	} else {
-		_vm->initGnapPos(4, 7, kDirBottomRight);
-		_vm->initPlatypusPos(5, 7, kDirNone);
-		_vm->endSceneInit();
-	}
-
-	_vm->_timers[4] = _vm->getRandom(150) + 50;
-	_vm->_timers[5] = _vm->getRandom(40) + 50;
-
-	while (!_vm->_sceneDone) {
-		if (!_vm->isSoundPlaying(0x10919))
-			_vm->playSound(0x10919, true);
-	
-		_vm->testWalk(0, 0, -1, -1, -1, -1);
-	
-		_vm->updateMouseCursor();
-		_vm->updateCursorByHotspot();
-	
-		_vm->_sceneClickedHotspot = _vm->getClickedHotspotId();
-		_vm->updateGrabCursorSprite(0, 0);
-	
-		switch (_vm->_sceneClickedHotspot) {
-		case kHS09Device:
-			if (_vm->_gnapActionStatus < 0) {
-				_vm->runMenu();
-				updateHotspots();
-				_vm->_timers[4] = _vm->getRandom(150) + 50;
-				_vm->_timers[5] = _vm->getRandom(40) + 50;
-			}
-			break;
-
-		case kHS09Platypus:
-			switch (_vm->_verbCursor) {
-			case LOOK_CURSOR:
-				_vm->playGnapMoan1(_vm->_platX, _vm->_platY);
-				break;
-			case GRAB_CURSOR:
-				_vm->gnapKissPlatypus(0);
-				break;
-			case TALK_CURSOR:
-				_vm->playGnapBrainPulsating(_vm->_platX, _vm->_platY);
-				_vm->playPlatypusSequence(_vm->getPlatypusSequenceId());
-				break;
-			case PLAT_CURSOR:
-				break;
-			}
-			break;
-
-		case kHS09ExitKitchen:
-			_vm->_isLeavingScene = true;
-			_vm->_newSceneNum = 10;
-			_vm->gnapWalkTo(4, 7, 0, 0x107BF, 1);
-			_vm->_gnapActionStatus = kAS09LeaveScene;
-			_vm->platypusWalkTo(4, 8, -1, 0x107D2, 1);
-			_vm->_platypusFacing = kDirUnk4;
-			break;
-
-		case kHS09ExitHouse:
-			_vm->_isLeavingScene = true;
-			_vm->_newSceneNum = 8;
-			_vm->gnapWalkTo(10, -1, 0, 0x107AB, 1);
-			_vm->_gnapActionStatus = kAS09LeaveScene;
-			_vm->platypusWalkTo(10, -1, -1, 0x107CD, 1);
-			_vm->_platypusFacing = kDirUnk4;
-			break;
-
-		case kHS09Trash:
-			if (_vm->_grabCursorSpriteIndex >= 0) {
-				_vm->playGnapShowCurrItem(9, 6, 8, 0);
-			} else {
-				switch (_vm->_verbCursor) {
-				case LOOK_CURSOR:
-					_vm->playGnapScratchingHead(8, 3);
-					break;
-				case GRAB_CURSOR:
-					_vm->_gnapActionStatus = kAS09SearchTrash;
-					_vm->gnapWalkTo(9, 6, 0, 0x107BC, 1);
-					break;
-				case TALK_CURSOR:
-				case PLAT_CURSOR:
-					_vm->playGnapImpossible(0, 0);
-					break;
-				}
-			}
-			break;
-
-		case kHS09WalkArea1:
-		case kHS09WalkArea2:
-		case kHS09WalkArea3:
-			_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-			break;
-
-		default:
-			if (_vm->_mouseClickState._left) {
-				_vm->gnapWalkTo(-1, -1, -1, -1, 1);
-				_vm->_mouseClickState._left = false;
-			}
-			break;
-		}
-	
-		updateAnimations();
-	
-		if (!_vm->_isLeavingScene && _vm->_gnapActionStatus != 1 && _vm->_gnapActionStatus != 2) {
-			_vm->updatePlatypusIdleSequence();
-			_vm->updateGnapIdleSequence();
-			if (!_vm->_timers[4]) {
-				_vm->_timers[4] = _vm->getRandom(150) + 100;
-				if (_vm->_timers[4] & 1)
-					_vm->_gameSys->insertSequence(0x49, 1, 0, 0, kSeqNone, 0, 0, 0);
-				else
-					_vm->_gameSys->insertSequence(0x4A, 1, 0, 0, kSeqNone, 0, 0, 0);
-			}
-			playRandomSound(5);
-		}
-	
-		_vm->checkGameKeys();
-	
-		if (_vm->isKeyStatus1(8)) {
-			_vm->clearKeyStatus1(8);
-			_vm->runMenu();
-			updateHotspots();
-			_vm->_timers[4] = _vm->getRandom(150) + 50;
-			_vm->_timers[5] = _vm->getRandom(40) + 50;
-		}
-		
-		_vm->gameUpdateTick();
-	}
-}
-
-void Scene09::updateAnimations() {
-	if (_vm->_gameSys->getAnimationStatus(0) == 2) {
-		_vm->_gameSys->setAnimation(0, 0, 0);
-		switch (_vm->_gnapActionStatus) {
-		case kAS09LeaveScene:
-			_vm->_sceneDone = true;
-			_vm->_gnapActionStatus = -1;
-			break;
-		case kAS09SearchTrash:
-			_vm->_gameSys->setAnimation(0x4C, 120, 0);
-			_vm->_gameSys->insertSequence(0x4C, 120, makeRid(_vm->_gnapSequenceDatNum, _vm->_gnapSequenceId), _vm->_gnapId, kSeqSyncWait, 0, 0, 0);
-			_vm->_gameSys->removeSequence(0x4B, 2, true);
-			_vm->_gnapSequenceId = 0x4C;
-			_vm->_gnapId = 120;
-			_vm->_gnapIdleFacing = kDirUpLeft;
-			_vm->_gnapSequenceDatNum = 0;
-			_vm->_gnapX = 9;
-			_vm->_gnapY = 6;
-			_vm->_gnapActionStatus = kAS09SearchTrashDone;
-			break;
-		case kAS09SearchTrashDone:
-			_vm->_gameSys->insertSequence(0x4B, 2, 0, 0, kSeqNone, 0, 0, 0);
-			_vm->_timers[2] = 360;
-			_vm->_timers[4] = _vm->getRandom(150) + 100;
-			_vm->_gnapActionStatus = -1;
-			break;
-		}
-	}
-}
-
-} // End of namespace Gnap
diff --git a/engines/gnap/scenes/scene09.h b/engines/gnap/scenes/scene09.h
deleted file mode 100644
index 2a1576e663..0000000000
--- a/engines/gnap/scenes/scene09.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef GNAP_SCENE09_H
-#define GNAP_SCENE09_H
-
-#include "gnap/debugger.h"
-#include "gnap/scenes/scenecore.h"
-
-namespace Gnap {
-
-class GnapEngine;
-
-class Scene09: public Scene {
-public:
-	Scene09(GnapEngine *vm);
-	~Scene09() {}
-
-	virtual int init();
-	virtual void updateHotspots();
-	virtual void run();
-	virtual void updateAnimations();
-	virtual void updateAnimationsCb() {}
-};
-
-} // End of namespace Gnap
-#endif // GNAP_SCENE09_H
diff --git a/engines/gnap/scenes/scenecore.cpp b/engines/gnap/scenes/scenecore.cpp
index 309c872526..567270a1db 100644
--- a/engines/gnap/scenes/scenecore.cpp
+++ b/engines/gnap/scenes/scenecore.cpp
@@ -23,20 +23,12 @@
 #include "gnap/gnap.h"
 #include "gnap/gamesys.h"
 #include "gnap/resource.h"
-#include "gnap/scenes/scenecore.h"
 
+#include "gnap/scenes/scenecore.h"
 #include "gnap/scenes/groupcs.h"
+#include "gnap/scenes/group0.h"
+#include "gnap/scenes/intro.h"
 
-#include "gnap/scenes/scene00.h"
-#include "gnap/scenes/scene01.h"
-#include "gnap/scenes/scene02.h"
-#include "gnap/scenes/scene03.h"
-#include "gnap/scenes/scene04.h"
-#include "gnap/scenes/scene05.h"
-#include "gnap/scenes/scene06.h"
-#include "gnap/scenes/scene07.h"
-#include "gnap/scenes/scene08.h"
-#include "gnap/scenes/scene09.h"
 #include "gnap/scenes/scene10.h"
 #include "gnap/scenes/scene11.h"
 #include "gnap/scenes/scene12.h"
@@ -82,7 +74,7 @@ int GnapEngine::initSceneLogic() {
 
 	switch (_currentSceneNum) {
 	case 0:
-		_scene = new Scene00(this);
+		_scene = new SceneIntro(this);
 		backgroundId = _scene->init();
 		_gameSys->setScaleValues(0, 500, 1, 1000);
 		break;