GNAP: Rename two Facing enums

8 files changed, 134 insertions, 134 deletions

diff --git a/engines/gnap/character.cpp b/engines/gnap/character.cpp
index 575e3f3dd9..5eb35d1237 100644
--- a/engines/gnap/character.cpp
+++ b/engines/gnap/character.cpp
@@ -28,7 +28,7 @@ namespace Gnap {
 
 Character::Character(GnapEngine *vm) : _vm(vm) {
 	_pos = Common::Point(0, 0);
-	_idleFacing = kDirNone;
+	_idleFacing = kDirIdleLeft;
 	_actionStatus = 0;
 	_sequenceId = 0;
 	_sequenceDatNum = 0;
@@ -373,8 +373,8 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) {
 			case kDirUpRight:
 				sequenceId = 0x82F;
 				break;
-			case kDirNone:
-			case kDirUnk4:
+			case kDirIdleLeft:
+			case kDirIdleRight:
 				break;
 			}
 		}
@@ -394,8 +394,8 @@ int PlayerGnap::getSequenceId(int kind, Common::Point gridPos) {
 		case kDirUpRight:
 			sequenceId = 0x83E;
 			break;
-		case kDirNone:
-		case kDirUnk4:
+		case kDirIdleLeft:
+		case kDirIdleRight:
 			break;
 		}
 		break;
@@ -478,7 +478,7 @@ void PlayerGnap::useJointOnPlatypus() {
 			kSeqSyncWait, 0, 15 * (5 * plat._pos.x - 25), 48 * (plat._pos.y - 7));
 		plat._sequenceDatNum = 1;
 		plat._sequenceId = 0x876;
-		plat._idleFacing = kDirNone;
+		plat._idleFacing = kDirIdleLeft;
 		playSequence(0x107B5);
 		walkStep();
 		while (_vm->_gameSys->getAnimationStatus(0) != 2 && !_vm->_gameDone) {
@@ -509,7 +509,7 @@ void PlayerGnap::kissPlatypus(int callback) {
 			kSeqSyncWait, _vm->getSequenceTotalDuration(0x10847), 75 * plat._pos.x - plat._gridX, 48 * plat._pos.y - plat._gridY);
 		plat._sequenceDatNum = 1;
 		plat._sequenceId = 0x7CB;
-		plat._idleFacing = kDirNone;
+		plat._idleFacing = kDirIdleLeft;
 		playSequence(0x107B5);
 		while (_vm->_gameSys->getAnimationStatus(0) != 2 && !_vm->_gameDone) {
 			_vm->updateMouseCursor();
@@ -528,7 +528,7 @@ void PlayerGnap::useDeviceOnPlatypus() {
 
 	playSequence(makeRid(1, getSequenceId(kGSPullOutDevice, plat._pos)));
 
-	if (plat._idleFacing != kDirNone) {
+	if (plat._idleFacing != kDirIdleLeft) {
 		_vm->_gameSys->insertSequence(makeRid(1, 0x7D5), plat._id,
 			makeRid(plat._sequenceDatNum, plat._sequenceId), plat._id,
 			kSeqSyncWait, 0, 75 * plat._pos.x - plat._gridX, 48 * plat._pos.y - plat._gridY);
@@ -653,10 +653,11 @@ void PlayerGnap::initPos(int gridX, int gridY, Facing facing) {
 	_vm->_timers[2] = 30;
 	_vm->_timers[3] = 300;
 	_pos = Common::Point(gridX, gridY);
-	if (facing == kDirNone)
+	if (facing == kDirIdleLeft)
 		_idleFacing = kDirBottomRight;
 	else
 		_idleFacing = facing;
+
 	if (_idleFacing == kDirBottomLeft) {
 		_sequenceId = 0x7B8;
 	} else {
@@ -1167,9 +1168,9 @@ int PlayerPlat::getSequenceId(int kind, Common::Point gridPos) {
 
 	int sequenceId = 0x7CB;
 
-	if (_idleFacing != kDirNone) {
+	if (_idleFacing != kDirIdleLeft) {
 		sequenceId = 0x7CC;
-		_idleFacing = kDirUnk4;
+		_idleFacing = kDirIdleRight;
 	}
 
 	return sequenceId | 0x10000;
@@ -1189,7 +1190,7 @@ void PlayerPlat::updateIdleSequence() {
 			if (_vm->_timers[1] == 0) {
 				_vm->_timers[1] = _vm->getRandom(20) + 30;
 				int rnd = _vm->getRandom(10);
-				if (_idleFacing != kDirNone) {
+				if (_idleFacing != kDirIdleLeft) {
 					if (rnd != 0 || _sequenceId != 0x7CA) {
 						if (rnd != 1 || _sequenceId != 0x7CA)
 							playSequence(0x107CA);
@@ -1228,7 +1229,7 @@ void PlayerPlat::updateIdleSequence2() {
 		if (_vm->_timers[0]) {
 			if (!_vm->_timers[1]) {
 				_vm->_timers[1] = _vm->getRandom(20) + 30;
-				if (_idleFacing != kDirNone) {
+				if (_idleFacing != kDirIdleLeft) {
 					if (_vm->getRandom(10) >= 2 || _sequenceId != 0x7CA)
 						playSequence(0x107CA);
 					else
@@ -1255,15 +1256,15 @@ void PlayerPlat::initPos(int gridX, int gridY, Facing facing) {
 	_vm->_timers[0] = 50;
 	_vm->_timers[1] = 20;
 	_pos = Common::Point(gridX, gridY);
-	if (facing == kDirNone)
-		_idleFacing = kDirNone;
+	if (facing == kDirIdleLeft)
+		_idleFacing = kDirIdleLeft;
 	else
 		_idleFacing = facing;
-	if (_idleFacing == kDirUnk4) {
+	if (_idleFacing == kDirIdleRight) {
 		_sequenceId = 0x7D1;
 	} else {
 		_sequenceId = 0x7C1;
-		_idleFacing = kDirNone;
+		_idleFacing = kDirIdleLeft;
 	}
 	_id = 20 * _pos.y;
 	_sequenceDatNum = 1;
@@ -1371,15 +1372,14 @@ bool PlayerPlat::walkTo(Common::Point gridPos, int animationIndex, int sequenceI
 			_sequenceId = platSequenceId;
 			_id = platId;
 			_sequenceDatNum = datNum;
-			// CHECKME Not sure if this is correct...
 			if (_walkNodes[_walkNodesCount - 1]._deltaX > 0)
-				_idleFacing = kDirNone;
+				_idleFacing = kDirIdleLeft;
 			else if (_walkNodes[_walkNodesCount - 1]._deltaX < 0)
-				_idleFacing = kDirUnk4;
+				_idleFacing = kDirIdleRight;
 			else if (_walkNodes[_walkNodesCount - 1]._gridX1 % 2)
-				_idleFacing = kDirUnk4;
+				_idleFacing = kDirIdleRight;
 			else
-				_idleFacing = kDirNone;
+				_idleFacing = kDirIdleLeft;
 			if (animationIndex >= 0)
 				_vm->_gameSys->setAnimation(makeRid(_sequenceDatNum, _sequenceId), _id, animationIndex);
 		} else if (animationIndex >= 0) {
@@ -1391,29 +1391,29 @@ bool PlayerPlat::walkTo(Common::Point gridPos, int animationIndex, int sequenceI
 			_sequenceId = ridToEntryIndex(sequenceId);
 			_sequenceDatNum = ridToDatIndex(sequenceId);
 			if (_sequenceId == 0x7C2) {
-				_idleFacing = kDirNone;
+				_idleFacing = kDirIdleLeft;
 			} else if (_sequenceId == 0x7D2) {
-				_idleFacing = kDirUnk4;
+				_idleFacing = kDirIdleRight;
 			}
 		} else {
 			if (_walkNodesCount > 0) {
 				if (_walkNodes[_walkNodesCount - 1]._deltaX > 0) {
 					_sequenceId = 0x7C2;
-					_idleFacing = kDirNone;
+					_idleFacing = kDirIdleLeft;
 				} else if (_walkNodes[_walkNodesCount - 1]._deltaX < 0) {
 					_sequenceId = 0x7D2;
-					_idleFacing = kDirUnk4;
+					_idleFacing = kDirIdleRight;
 				} else if (_walkNodes[0]._deltaX > 0) {
 					_sequenceId = 0x7C2;
-					_idleFacing = kDirNone;
+					_idleFacing = kDirIdleLeft;
 				} else if (_walkNodes[0]._deltaX < 0) {
 					_sequenceId = 0x7D2;
-					_idleFacing = kDirUnk4;
+					_idleFacing = kDirIdleRight;
 				} else {
 					_sequenceId = 0x7D2;
-					_idleFacing = kDirUnk4;
+					_idleFacing = kDirIdleRight;
 				}
-			} else if (_idleFacing != kDirNone) {
+			} else if (_idleFacing != kDirIdleLeft) {
 				_sequenceId = 0x7D2;
 			} else {
 				_sequenceId = 0x7C2;
diff --git a/engines/gnap/character.h b/engines/gnap/character.h
index be6efbfdf4..27e98be15c 100644
--- a/engines/gnap/character.h
+++ b/engines/gnap/character.h
@@ -28,10 +28,10 @@ namespace Gnap {
 class GnapEngine;
 
 enum Facing {
-	kDirNone = 0,
+	kDirIdleLeft = 0,
 	kDirBottomRight = 1,
 	kDirBottomLeft = 3,
-	kDirUnk4 = 4,
+	kDirIdleRight = 4,
 	kDirUpLeft = 5,
 	kDirUpRight = 7
 };
diff --git a/engines/gnap/grid.cpp b/engines/gnap/grid.cpp
index b3a8a4b305..2197317227 100644
--- a/engines/gnap/grid.cpp
+++ b/engines/gnap/grid.cpp
@@ -75,7 +75,7 @@ int PlayerGnap::getWalkStopSequenceId(int deltaX, int deltaY) {
 Facing PlayerGnap::getWalkFacing(int deltaX, int deltaY) {
 	static const Facing gnapWalkFacings[9] = {
 		kDirUpLeft, kDirBottomLeft, kDirBottomLeft,
-		kDirUpLeft, kDirNone, kDirBottomLeft,
+		kDirUpLeft, kDirIdleLeft, kDirBottomLeft,
 		kDirUpRight, kDirBottomRight, kDirBottomRight
 	};
 	// CHECKME This is a little weird
diff --git a/engines/gnap/scenes/group0.cpp b/engines/gnap/scenes/group0.cpp
index a3359bfb39..e55b08eac3 100644
--- a/engines/gnap/scenes/group0.cpp
+++ b/engines/gnap/scenes/group0.cpp
@@ -92,7 +92,7 @@ void Scene01::run() {
 	if (_vm->_prevSceneNum == 2) {
 		gnap.initPos(11, 6, kDirBottomLeft);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(12, 6, kDirUnk4);
+			plat.initPos(12, 6, kDirIdleRight);
 		_vm->endSceneInit();
 		if (_vm->isFlag(kGFPlatypus))
 			plat.walkTo(Common::Point(9, 6), -1, 0x107C2, 1);
@@ -100,7 +100,7 @@ void Scene01::run() {
 	} else {
 		gnap.initPos(1, 6, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(1, 7, kDirNone);
+			plat.initPos(1, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
@@ -416,7 +416,7 @@ void Scene02::run() {
 	case 3:
 		gnap.initPos(11, 6, kDirBottomLeft);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(12, 6, kDirUnk4);
+			plat.initPos(12, 6, kDirIdleRight);
 		_vm->endSceneInit();
 		if (_vm->isFlag(kGFPlatypus))
 			plat.walkTo(Common::Point(9, 6), -1, 0x107C2, 1);
@@ -425,7 +425,7 @@ void Scene02::run() {
 	case 4:
 		gnap.initPos(_vm->_hotspotsWalkPos[6].x, _vm->_hotspotsWalkPos[6].y, kDirBottomLeft);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, kDirUnk4);
+			plat.initPos(_vm->_hotspotsWalkPos[6].x + 1, _vm->_hotspotsWalkPos[6].y, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(7, 6), 0, 0x107B9, 1);
 		if (_vm->isFlag(kGFPlatypus))
@@ -436,19 +436,19 @@ void Scene02::run() {
 	case 47:
 		_vm->clearFlag(kGFUnk25);
 		gnap.initPos(5, 6, kDirBottomLeft);
-		plat.initPos(6, 7, kDirUnk4);
+		plat.initPos(6, 7, kDirIdleRight);
 		_vm->endSceneInit();
 		break;
 	case 49:
 		gnap.initPos(5, 6, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(6, 7, kDirNone);
+			plat.initPos(6, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		break;
 	default:
 		gnap.initPos(-1, 6, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(-1, 7, kDirNone);
+			plat.initPos(-1, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		if (_vm->isFlag(kGFPlatypus))
 			plat.walkTo(Common::Point(2, 7), -1, 0x107C2, 1);
@@ -569,7 +569,7 @@ void Scene02::run() {
 									gnap._actionStatus = kAS02UseTruckNoGas;
 							}
 						} else {
-							gnap._idleFacing = kDirUnk4;
+							gnap._idleFacing = kDirIdleRight;
 							if (gnap.walkTo(_vm->_hotspotsWalkPos[3], 0, gnap.getSequenceId(kGSIdle, Common::Point(2, 2)) | 0x10000, 1))
 								gnap._actionStatus = kAS02UseTruckNoKeys;
 						}
@@ -911,7 +911,7 @@ void Scene03::run() {
 	_vm->_timers[5] = _vm->getRandom(100) + 200;
 
 	if (_vm->isFlag(kGFPlatypus)) {
-		plat.initPos(5, 4, kDirNone);
+		plat.initPos(5, 4, kDirIdleLeft);
 	} else {
 		_vm->_timers[1] = _vm->getRandom(40) + 20;
 		gameSys.setAnimation(0x1C2, 99, 1);
@@ -1191,7 +1191,7 @@ void Scene03::updateAnimations() {
 		case kAS03FreePlatypusDone:
 			gnap._actionStatus = -1;
 			plat._pos = Common::Point(6, 6);
-			plat._idleFacing = kDirUnk4;
+			plat._idleFacing = kDirIdleRight;
 			plat._id = 120;
 			gameSys.insertSequence(0x107CA, plat._id, 0x1BC, 99,
 				kSeqSyncWait, 0, 75 * plat._pos.x - plat._gridX, 48 * plat._pos.y - plat._gridY);
@@ -1267,7 +1267,7 @@ void Scene03::updateAnimations() {
 			gameSys.insertSequence(_nextPlatSequenceId, 99, plat._sequenceId | (plat._sequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
 			gnap._sequenceId = 0x1B5;
 			gnap._sequenceDatNum = 0;
-			gnap._idleFacing = kDirNone;
+			gnap._idleFacing = kDirIdleLeft;
 			plat._sequenceId = _nextPlatSequenceId;
 			plat._sequenceDatNum = 0;
 			gameSys.setAnimation(_nextPlatSequenceId, 99, 1);
@@ -1281,7 +1281,7 @@ void Scene03::updateAnimations() {
 			gnap._id = 20 * gnap._pos.y;
 			gnap._sequenceId = 0x1B6;
 			gnap._sequenceDatNum = 0;
-			gnap._idleFacing = kDirNone;
+			gnap._idleFacing = kDirIdleLeft;
 			gnap._actionStatus = kAS03FreePlatypusDone;
 			_nextPlatSequenceId = -1;
 		} else if (_nextPlatSequenceId == 0x1C2 && !_platypusScared) {
@@ -1418,12 +1418,12 @@ void Scene04::run() {
 			gnap.walkTo(Common::Point(6, 9), -1, 0x107BA, 1);
 		} else if (_vm->_prevSceneNum == 38) {
 			gnap.initPos(5, 7, kDirBottomRight);
-			plat.initPos(4, 7, kDirNone);
+			plat.initPos(4, 7, kDirIdleLeft);
 			_vm->endSceneInit();
 		} else {
 			gnap.initPos(12, 9, kDirBottomRight);
 			if (_vm->isFlag(kGFPlatypus))
-				plat.initPos(12, 8, kDirNone);
+				plat.initPos(12, 8, kDirIdleLeft);
 			_vm->endSceneInit();
 			if (_vm->isFlag(kGFPlatypus))
 				plat.walkTo(Common::Point(9, 8), -1, 0x107C2, 1);
@@ -1897,7 +1897,7 @@ void Scene05::run() {
 	if (_vm->_prevSceneNum != 6 && _vm->_prevSceneNum != 36) {
 		gnap.initPos(-1, 8, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(-1, 9, kDirNone);
+			plat.initPos(-1, 9, kDirIdleLeft);
 		_vm->endSceneInit();
 		if (_vm->isFlag(kGFPlatypus))
 			plat.walkTo(Common::Point(2, 8), -1, 0x107C2, 1);
@@ -1905,7 +1905,7 @@ void Scene05::run() {
 	} else {
 		gnap.initPos(6, 8, kDirBottomRight);
 		if (_vm->isFlag(kGFPlatypus))
-			plat.initPos(7, 9, kDirNone);
+			plat.initPos(7, 9, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
@@ -1975,7 +1975,7 @@ void Scene05::run() {
 							gnap.useDeviceOnPlatypus();
 							if (plat.walkTo(_vm->_hotspotsWalkPos[1], 1, 0x107C2, 1)) {
 								plat._actionStatus = kAS05PlatSearchHaystack;
-								plat._idleFacing = kDirUnk4;
+								plat._idleFacing = kDirIdleRight;
 							}
 							if (gnap._pos.x == 4 && (gnap._pos.y == 8 || gnap._pos.y == 7))
 								gnap.walkStep();
@@ -2332,7 +2332,7 @@ void Scene06::run() {
 	_vm->queueInsertDeviceIcon();
 
 	gnap.initPos(5, 12, kDirBottomRight);
-	plat.initPos(6, 12, kDirNone);
+	plat.initPos(6, 12, kDirIdleLeft);
 	_vm->endSceneInit();
 
 	plat.walkTo(Common::Point(6, 8), -1, 0x107C2, 1);
@@ -2453,7 +2453,7 @@ void Scene06::run() {
 					_vm->_hotspots[kHS06WalkArea5]._flags &= ~SF_WALKABLE;
 					gnap._idleFacing = kDirUpLeft;
 					plat.walkTo(Common::Point(6, 8), 1, 0x107C2, 1);
-					plat._idleFacing = kDirNone;
+					plat._idleFacing = kDirIdleLeft;
 					gnap._actionStatus = kAS06UseTwigOnHorse;
 					_vm->setGrabCursorSprite(-1);
 				} else if (_vm->_grabCursorSpriteIndex >= 0) {
@@ -2702,7 +2702,7 @@ void Scene07::run() {
 
 	if (_vm->_prevSceneNum == 8) {
 		gnap.initPos(7, 7, kDirBottomLeft);
-		plat.initPos(9, 7, kDirUnk4);
+		plat.initPos(9, 7, kDirIdleRight);
 		_vm->endSceneInit();
 	} else {
 		gnap._pos = Common::Point(6, 7);
@@ -2717,7 +2717,7 @@ void Scene07::run() {
 		plat._id = 160;
 		plat._sequenceId = 0x91;
 		plat._sequenceDatNum = 0;
-		plat._idleFacing = kDirNone;
+		plat._idleFacing = kDirIdleLeft;
 		gameSys.insertSequence(0x91, 160, 0, 0, kSeqNone, 0, 0, 0);
 		_vm->endSceneInit();
 	}
@@ -2827,7 +2827,7 @@ void Scene07::run() {
 					if (!_vm->_timers[1]) {
 						_vm->_timers[1] = _vm->getRandom(20) + 30;
 						int gnapRandomValue = _vm->getRandom(20);
-						if (plat._idleFacing != kDirNone) {
+						if (plat._idleFacing != kDirIdleLeft) {
 							if (gnapRandomValue == 0 && plat._sequenceId == 0x7CA)
 								plat.playSequence(0x107CC);
 							else if (gnapRandomValue == 1 && plat._sequenceId == 0x7CA)
@@ -2966,7 +2966,7 @@ void Scene08::run() {
 		gameSys.insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
 
 	gnap.initPos(-1, 8, kDirBottomRight);
-	plat.initPos(-1, 7, kDirNone);
+	plat.initPos(-1, 7, kDirIdleLeft);
 
 	_vm->endSceneInit();
 
@@ -3065,7 +3065,7 @@ void Scene08::run() {
 					gnap.useDeviceOnPlatypus();
 					plat.walkTo(Common::Point(6, 6), 1, 0x107C2, 1);
 					plat._actionStatus = kAS08PlatWithMan;
-					plat._idleFacing = kDirNone;
+					plat._idleFacing = kDirIdleLeft;
 					gnap.playIdle(Common::Point(6, 6));
 					break;
 				}
@@ -3101,7 +3101,7 @@ void Scene08::run() {
 					gnap.useDeviceOnPlatypus();
 					plat.walkTo(Common::Point(3, 7), 1, 0x107C2, 1);
 					plat._actionStatus = kAS08PlatWithDog;
-					plat._idleFacing = kDirNone;
+					plat._idleFacing = kDirIdleLeft;
 					gnap.playIdle(Common::Point(3, 7));
 					break;
 				}
@@ -3346,7 +3346,7 @@ void Scene08::updateAnimations() {
 			plat._pos = Common::Point(1, 8);
 			plat._id = 160;
 			plat._sequenceId = 0x148;
-			plat._idleFacing = kDirUnk4;
+			plat._idleFacing = kDirIdleRight;
 			plat._sequenceDatNum = 0;
 			if (gnap._pos == Common::Point(1, 8))
 				gnap.walkStep();
@@ -3402,13 +3402,13 @@ void Scene09::run() {
 
 	if (_vm->_prevSceneNum == 8) {
 		gnap.initPos(11, 8, kDirBottomLeft);
-		plat.initPos(12, 7, kDirUnk4);
+		plat.initPos(12, 7, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(9, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(9, 7), -1, 0x107D2, 1);
 	} else {
 		gnap.initPos(4, 7, kDirBottomRight);
-		plat.initPos(5, 7, kDirNone);
+		plat.initPos(5, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
@@ -3460,7 +3460,7 @@ void Scene09::run() {
 			gnap.walkTo(Common::Point(4, 7), 0, 0x107BF, 1);
 			gnap._actionStatus = kAS09LeaveScene;
 			plat.walkTo(Common::Point(4, 8), -1, 0x107D2, 1);
-			plat._idleFacing = kDirUnk4;
+			plat._idleFacing = kDirIdleRight;
 			break;
 
 		case kHS09ExitHouse:
@@ -3469,7 +3469,7 @@ void Scene09::run() {
 			gnap.walkTo(Common::Point(10, -1), 0, 0x107AB, 1);
 			gnap._actionStatus = kAS09LeaveScene;
 			plat.walkTo(Common::Point(10, -1), -1, 0x107CD, 1);
-			plat._idleFacing = kDirUnk4;
+			plat._idleFacing = kDirIdleRight;
 			break;
 
 		case kHS09Trash:
diff --git a/engines/gnap/scenes/group1.cpp b/engines/gnap/scenes/group1.cpp
index 1a414cb2f4..f76d04c64d 100644
--- a/engines/gnap/scenes/group1.cpp
+++ b/engines/gnap/scenes/group1.cpp
@@ -75,13 +75,13 @@ void Scene10::run() {
 
 	if (_vm->_prevSceneNum == 9) {
 		gnap.initPos(11, 8, kDirBottomLeft);
-		plat.initPos(12, 7, kDirUnk4);
+		plat.initPos(12, 7, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(9, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(9, 7), -1, 0x107D2, 1);
 	} else {
 		gnap.initPos(-1, 7, kDirBottomRight);
-		plat.initPos(-2, 8, kDirNone);
+		plat.initPos(-2, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(1, 7), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(1, 8), -1, 0x107C2, 1);
@@ -244,7 +244,7 @@ void Scene10::run() {
 						gnap.useDeviceOnPlatypus();
 						plat.walkTo(Common::Point(7, 6), 1, 0x107D2, 1);
 						plat._actionStatus = kAS10PlatWithBox;
-						plat._idleFacing = kDirUnk4;
+						plat._idleFacing = kDirIdleRight;
 						_vm->_largeSprite = gameSys.createSurface(0xC3);
 						gnap.playIdle(Common::Point(7, 6));
 					}
@@ -383,7 +383,7 @@ void Scene10::updateAnimations() {
 			_nextCookSequenceId = 0x843;
 			plat._sequenceId = 0x7C9;
 			plat._id = 160;
-			plat._idleFacing = kDirNone;
+			plat._idleFacing = kDirIdleLeft;
 			plat._sequenceDatNum = 1;
 			break;
 		case 0x843:
@@ -551,22 +551,22 @@ void Scene11::run() {
 	switch (_vm->_prevSceneNum) {
 	case 13:
 		gnap.initPos(8, 5, kDirBottomLeft);
-		plat.initPos(9, 6, kDirUnk4);
+		plat.initPos(9, 6, kDirIdleRight);
 		break;
 	case 47:
 		gnap.initPos(8, 5, kDirBottomLeft);
-		plat.initPos(9, 5, kDirUnk4);
+		plat.initPos(9, 5, kDirIdleRight);
 		_currGoggleGuySequenceId = 0x1FA;
 		_currHookGuySequenceId = 0x1FF;
 		_vm->_timers[7] = 180;
 		break;
 	case 12:
 		gnap.initPos(-1, 9, kDirBottomRight);
-		plat.initPos(-2, 8, kDirNone);
+		plat.initPos(-2, 8, kDirIdleLeft);
 		break;
 	default:
 		gnap.initPos(6, 6, kDirBottomLeft);
-		plat.initPos(6, 5, kDirUnk4);
+		plat.initPos(6, 5, kDirIdleRight);
 		break;
 	}
 
@@ -1003,11 +1003,11 @@ void Scene12::run() {
 
 	if (_vm->_prevSceneNum == 15) {
 		gnap.initPos(5, 6, kDirBottomRight);
-		plat.initPos(3, 7, kDirNone);
+		plat.initPos(3, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 	} else {
 		gnap.initPos(11, 8, kDirBottomLeft);
-		plat.initPos(12, 8, kDirUnk4);
+		plat.initPos(12, 8, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(8, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(9, 8), -1, 0x107D2, 1);
@@ -1092,7 +1092,7 @@ void Scene12::run() {
 					gnap.useDeviceOnPlatypus();
 					plat.walkTo(Common::Point(3, 7), 1, 0x107D2, 1);
 					plat._actionStatus = kAS12PlatWithToothGuy;
-					plat._idleFacing = kDirUnk4;
+					plat._idleFacing = kDirIdleRight;
 					gnap.playIdle(Common::Point(2, 7));
 					break;
 				}
@@ -1162,7 +1162,7 @@ void Scene12::run() {
 					gnap.useDeviceOnPlatypus();
 					plat.walkTo(Common::Point(7, 6), 1, 0x107C2, 1);
 					plat._actionStatus = kAS12PlatWithBeardGuy;
-					plat._idleFacing = kDirNone;
+					plat._idleFacing = kDirIdleLeft;
 					gnap.playIdle(Common::Point(7, 6));
 					break;
 				}
@@ -1511,10 +1511,10 @@ void Scene13::run() {
 
 	if (_vm->_prevSceneNum == 14) {
 		gnap.initPos(6, 6, kDirBottomLeft);
-		plat.initPos(9, 8, kDirNone);
+		plat.initPos(9, 8, kDirIdleLeft);
 	} else {
 		gnap.initPos(3, 7, kDirBottomRight);
-		plat.initPos(2, 7, kDirNone);
+		plat.initPos(2, 7, kDirIdleLeft);
 	}
 
 	_vm->endSceneInit();
@@ -2445,7 +2445,7 @@ void Scene17::run() {
 	if (_vm->_prevSceneNum == 53 || _vm->_prevSceneNum == 18 || _vm->_prevSceneNum == 20 || _vm->_prevSceneNum == 19) {
 		if (_vm->_prevSceneNum == 20) {
 			gnap.initPos(4, 6, kDirBottomRight);
-			plat.initPos(5, 6, kDirNone);
+			plat.initPos(5, 6, kDirIdleLeft);
 			_vm->endSceneInit();
 			plat.walkTo(Common::Point(5, 9), -1, 0x107C2, 1);
 			gnap.walkTo(Common::Point(4, 8), -1, 0x107B9, 1);
@@ -2469,7 +2469,7 @@ void Scene17::run() {
 		} else if (_vm->isFlag(kGFUnk25)) {
 			_vm->clearFlag(kGFSpringTaken);
 			_vm->clearFlag(kGFUnk16);
-			plat.initPos(7, 9, kDirNone);
+			plat.initPos(7, 9, kDirIdleLeft);
 			gnap._pos = _vm->_hotspotsWalkPos[2];
 			gnap._id = 20 * _vm->_hotspotsWalkPos[2].y;
 			gameSys.insertSequence(601, 20 * _vm->_hotspotsWalkPos[2].y, 0, 0, kSeqNone, 0, 0, 0);
@@ -2499,18 +2499,18 @@ void Scene17::run() {
 			updateHotspots();
 		} else if (_vm->_prevSceneNum == 18) {
 			gnap.initPos(6, 6, kDirBottomRight);
-			plat.initPos(5, 6, kDirNone);
+			plat.initPos(5, 6, kDirIdleLeft);
 			_vm->endSceneInit();
 			plat.walkTo(Common::Point(5, 9), -1, 0x107C2, 1);
 			gnap.walkTo(Common::Point(4, 8), -1, 0x107B9, 1);
 		} else {
 			if (_vm->isFlag(kGFSpringTaken)) {
 				gnap.initPos(_vm->_hotspotsWalkPos[2].x, _vm->_hotspotsWalkPos[2].y, kDirBottomRight);
-				plat.initPos(1, 9, kDirNone);
+				plat.initPos(1, 9, kDirIdleLeft);
 				_vm->endSceneInit();
 			} else {
 				gnap.initPos(3, 7, kDirBottomRight);
-				plat.initPos(1, 7, kDirNone);
+				plat.initPos(1, 7, kDirIdleLeft);
 				_vm->endSceneInit();
 			}
 			_vm->clearFlag(kGFSpringTaken);
@@ -3275,13 +3275,13 @@ void Scene18::putDownGarbageCan(int animationIndex) {
 		while (gameSys.getAnimationStatus(animationIndex) != 2 && !_vm->_gameDone)
 			_vm->gameUpdateTick();
 	}
-	if (gnap._idleFacing != kDirNone && gnap._idleFacing != kDirBottomRight && gnap._idleFacing != kDirUpRight)
+	if (gnap._idleFacing != kDirIdleLeft && gnap._idleFacing != kDirBottomRight && gnap._idleFacing != kDirUpRight)
 		_vm->_s18GarbageCanPos = gnap._pos.x - 1;
 	else
 		_vm->_s18GarbageCanPos = gnap._pos.x + 1;
 	_vm->clearFlag(kGFPlatypusDisguised);
 	updateHotspots();
-	if (gnap._idleFacing != kDirNone && gnap._idleFacing != kDirBottomRight && gnap._idleFacing != kDirUpRight) {
+	if (gnap._idleFacing != kDirIdleLeft && gnap._idleFacing != kDirBottomRight && gnap._idleFacing != kDirUpRight) {
 		gameSys.insertSequence(0x107BA, gnap._id,
 			makeRid(gnap._sequenceDatNum, gnap._sequenceId), gnap._id,
 			kSeqSyncWait, 0, 75 * gnap._pos.x - gnap._gridX, 48 * gnap._pos.y - gnap._gridY);
@@ -3429,19 +3429,19 @@ void Scene18::run() {
 		}
 		if (_vm->_prevSceneNum == 17) {
 			gnap.initPos(4, 11, kDirBottomRight);
-			plat.initPos(5, 11, kDirNone);
+			plat.initPos(5, 11, kDirIdleLeft);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(4, 8), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(5, 9), -1, 0x107C2, 1);
 		} else if (_vm->_prevSceneNum == 19) {
 			gnap.initPos(7, 7, kDirBottomRight);
-			plat.initPos(8, 7, kDirNone);
+			plat.initPos(8, 7, kDirIdleLeft);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(7, 8), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(8, 8), -1, 0x107C2, 1);
 		} else {
 			gnap.initPos(-1, 10, kDirBottomRight);
-			plat.initPos(-1, 10, kDirNone);
+			plat.initPos(-1, 10, kDirIdleLeft);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(3, 7), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(3, 8), -1, 0x107C2, 1);
@@ -3781,7 +3781,7 @@ void Scene18::run() {
 					if (!_vm->_timers[6]) {
 						plat._actionStatus = -1;
 						_vm->_sceneWaiting = false;
-						plat.initPos(-1, 10, kDirNone);
+						plat.initPos(-1, 10, kDirIdleLeft);
 						plat.walkTo(Common::Point(3, 9), -1, 0x107C2, 1);
 						_vm->clearFlag(kGFPlatypusTalkingToAssistant);
 					}
@@ -4157,7 +4157,7 @@ void Scene19::run() {
 		gameSys.insertSequence(_currShopAssistantSequenceId, 20, 0, 0, kSeqNone, 0, 0, 0);
 		_vm->_timers[6] = _vm->getRandom(40) + 50;
 		gnap.initPos(3, 6, kDirBottomRight);
-		plat.initPos(4, 6, kDirNone);
+		plat.initPos(4, 6, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(4, 9), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(5, 9), -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/group2.cpp b/engines/gnap/scenes/group2.cpp
index 3e61fafc8f..020b3d151c 100644
--- a/engines/gnap/scenes/group2.cpp
+++ b/engines/gnap/scenes/group2.cpp
@@ -209,42 +209,42 @@ void Scene20::run() {
 			_vm->gameUpdateTick();
 
 		gnap.initPos(11, 8, kDirBottomLeft);
-		plat.initPos(11, 9, kDirUnk4);
+		plat.initPos(11, 9, kDirIdleRight);
 		gnap.walkTo(Common::Point(5, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(6, 9), -1, 0x107C2, 1);
 	} else {
 		switch (_vm->_prevSceneNum) {
 		case 17:
 			gnap.initPos(5, 11, kDirBottomRight);
-			plat.initPos(6, 11, kDirNone);
+			plat.initPos(6, 11, kDirIdleLeft);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(5, 8), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(6, 9), -1, 0x107C2, 1);
 			break;
 		case 18:
 			gnap.initPos(11, 8, kDirBottomLeft);
-			plat.initPos(11, 9, kDirUnk4);
+			plat.initPos(11, 9, kDirIdleRight);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(5, 8), -1, 0x107BA, 1);
 			plat.walkTo(Common::Point(6, 9), -1, 0x107C2, 1);
 			break;
 		case 21:
 			gnap.initPos(-1, 8, kDirBottomLeft);
-			plat.initPos(-1, 9, kDirUnk4);
+			plat.initPos(-1, 9, kDirIdleRight);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(3, 8), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(3, 9), -1, 0x107C2, 1);
 			break;
 		case 22:
 			gnap.initPos(7, 6, kDirBottomRight);
-			plat.initPos(8, 6, kDirNone);
+			plat.initPos(8, 6, kDirIdleLeft);
 			_vm->endSceneInit();
 			gnap.walkTo(Common::Point(8, 8), -1, 0x107B9, 1);
 			plat.walkTo(Common::Point(9, 9), -1, 0x107C2, 1);
 			break;
 		default:
 			gnap.initPos(8, 6, kDirBottomLeft);
-			plat.initPos(9, 6, kDirUnk4);
+			plat.initPos(9, 6, kDirIdleRight);
 			_vm->endSceneInit();
 			_vm->_hotspots[kHS20WalkArea2]._flags |= SF_WALKABLE;
 			gnap.walkTo(Common::Point(8, 8), -1, 0x107BA, 1);
@@ -307,7 +307,7 @@ void Scene20::run() {
 				gnap.walkTo(_vm->_hotspotsWalkPos[kHS20ExitParkingLot], 0, 0x107AF, 1);
 				gnap._actionStatus = kAS20LeaveScene;
 				plat.walkTo(_vm->_hotspotsWalkPos[kHS20ExitParkingLot] + Common::Point(0, 1), -1, 0x107CF, 1);
-				plat._idleFacing = kDirUnk4;
+				plat._idleFacing = kDirIdleRight;
 			}
 			break;
 
@@ -346,7 +346,7 @@ void Scene20::run() {
 				gnap.walkTo(_vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity] + Common::Point(0, - 1), 0, 0x107BB, 1);
 				gnap._actionStatus = kAS20LeaveScene;
 				plat.walkTo(_vm->_hotspotsWalkPos[kHS20ExitInsideGrubCity] + Common::Point(1, 0), -1, 0x107C2, 1);
-				plat._idleFacing = kDirUnk4;
+				plat._idleFacing = kDirIdleRight;
 			}
 			break;
 
@@ -750,7 +750,7 @@ void Scene21::run() {
 	if (_vm->isFlag(kGFTwigTaken)) {
 		if (_vm->isFlag(kGFKeysTaken)) {
 			gnap.initPos(5, 8, kDirBottomRight);
-			plat.initPos(6, 8, kDirNone);
+			plat.initPos(6, 8, kDirIdleLeft);
 			gameSys.insertSequence(0x8E, 2, 0, 0, kSeqNone, 0, 0, 0);
 			if (!_vm->isFlag(kGFUnk04))
 				gameSys.insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
@@ -758,7 +758,7 @@ void Scene21::run() {
 			_vm->clearFlag(kGFKeysTaken);
 		} else {
 			gnap.initPos(5, 11, kDirBottomRight);
-			plat.initPos(6, 11, kDirNone);
+			plat.initPos(6, 11, kDirIdleLeft);
 			if (!_vm->isFlag(kGFUnk04))
 				gameSys.insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
 			_vm->endSceneInit();
@@ -767,7 +767,7 @@ void Scene21::run() {
 		}
 	} else {
 		gnap.initPos(5, 11, kDirBottomRight);
-		plat.initPos(6, 11, kDirNone);
+		plat.initPos(6, 11, kDirIdleLeft);
 		_currOldLadySequenceId = 0x89;
 		gameSys.setAnimation(0x89, 79, 3);
 		gameSys.insertSequence(_currOldLadySequenceId, 79, 0, 0, kSeqNone, 0, 0, 0);
@@ -1052,11 +1052,11 @@ void Scene22::run() {
 
 	if (_vm->_prevSceneNum == 20) {
 		gnap.initPos(2, 8, kDirBottomRight);
-		plat.initPos(1, 8, kDirNone);
+		plat.initPos(1, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 	} else {
 		gnap.initPos(11, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y, kDirBottomRight);
-		plat.initPos(11, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y + 1, kDirNone);
+		plat.initPos(11, _vm->_hotspotsWalkPos[kHS22ExitBackGrubCity].y + 1, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(8, 8), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(9, 8), -1, 0x107C2, 1);
@@ -1304,7 +1304,7 @@ void Scene23::run() {
 	_vm->queueInsertDeviceIcon();
 
 	gnap.initPos(-1, 7, kDirBottomRight);
-	plat.initPos(-2, 7, kDirNone);
+	plat.initPos(-2, 7, kDirIdleLeft);
 	gameSys.insertSequence(0xBD, 255, 0, 0, kSeqNone, 0, 0, 0);
 	gameSys.insertSequence(0xBF, 2, 0, 0, kSeqNone, 0, 0, 0);
 	_vm->endSceneInit();
@@ -1577,13 +1577,13 @@ void Scene24::run() {
 
 	if (_vm->_prevSceneNum == 20) {
 		gnap.initPos(1, 8, kDirBottomRight);
-		plat.initPos(2, 8, kDirNone);
+		plat.initPos(2, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(1, 9), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(2, 9), -1, 0x107C2, 1);
 	} else {
 		gnap.initPos(8, 8, kDirBottomLeft);
-		plat.initPos(8, 8, kDirUnk4);
+		plat.initPos(8, 8, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(2, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(3, 8), -1, 0x107C2, 1);
@@ -1827,13 +1827,13 @@ void Scene25::run() {
 
 	if (_vm->_prevSceneNum == 24) {
 		gnap.initPos(5, 11, kDirUpLeft);
-		plat.initPos(6, 11, kDirUnk4);
+		plat.initPos(6, 11, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(5, 7), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(6, 7), -1, 0x107C2, 1);
 	} else {
 		gnap.initPos(5, 6, kDirBottomRight);
-		plat.initPos(6, 6, kDirNone);
+		plat.initPos(6, 6, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(5, 8), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(6, 8), -1, 0x107C2, 1);
@@ -2148,13 +2148,13 @@ void Scene26::run() {
 
 	if (_vm->_prevSceneNum == 25) {
 		gnap.initPos(-1, 8, kDirBottomRight);
-		plat.initPos(-2, 8, kDirNone);
+		plat.initPos(-2, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(2, 8), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(1, 8), -1, 0x107C2, 1);
 	} else {
 		gnap.initPos(2, 8, kDirBottomRight);
-		plat.initPos(3, 8, kDirNone);
+		plat.initPos(3, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
@@ -2365,28 +2365,28 @@ void Scene27::run() {
 	switch (_vm->_prevSceneNum) {
 	case 26:
 		gnap.initPos(7, 12, kDirBottomRight);
-		plat.initPos(6, 12, kDirNone);
+		plat.initPos(6, 12, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(7, 8), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(6, 8), -1, 0x107C2, 1);
 		break;
 	case 29:
 		gnap.initPos(-1, 8, kDirBottomRight);
-		plat.initPos(-1, 9, kDirNone);
+		plat.initPos(-1, 9, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(3, 8), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(3, 9), -1, 0x107C2, 1);
 		break;
 	case 31:
 		gnap.initPos(12, 8, kDirBottomLeft);
-		plat.initPos(12, 9, kDirUnk4);
+		plat.initPos(12, 9, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(8, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(8, 9), -1, 0x107C2, 1);
 		break;
 	default:
 		gnap.initPos(6, 8, kDirBottomRight);
-		plat.initPos(5, 9, kDirNone);
+		plat.initPos(5, 9, kDirIdleLeft);
 		_vm->endSceneInit();
 		break;
 	}
@@ -2742,12 +2742,12 @@ void Scene28::run() {
 			_vm->_timers[4] = _vm->getRandom(20) + 80;
 		}
 		gnap.initPos(8, 8, kDirBottomLeft);
-		plat.initPos(9, 8, kDirUnk4);
+		plat.initPos(9, 8, kDirIdleRight);
 		_vm->endSceneInit();
 	} else {
 		gameSys.insertSequence(0x11B, 39, 0, 0, kSeqNone, 0, 0, 0);
 		gnap.initPos(8, 8, kDirBottomLeft);
-		plat.initPos(9, 8, kDirUnk4);
+		plat.initPos(9, 8, kDirIdleRight);
 		_vm->endSceneInit();
 		_vm->playSequences(0xF7, 0x121, 0x122, 0x123);
 		_currClownSequenceId = 0x115;
@@ -3149,13 +3149,13 @@ void Scene29::run() {
 
 	if (_vm->_prevSceneNum == 27) {
 		gnap.initPos(12, 7, kDirBottomRight);
-		plat.initPos(12, 8, kDirNone);
+		plat.initPos(12, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(8, 7), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(8, 8), -1, 0x107C2, 1);
 	} else {
 		gnap.initPos(-1, 7, kDirBottomRight);
-		plat.initPos(-2, 7, kDirNone);
+		plat.initPos(-2, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(2, 7), -1, 0x107B9, 1);
 		plat.walkTo(Common::Point(1, 7), -1, 0x107C2, 1);
diff --git a/engines/gnap/scenes/group3.cpp b/engines/gnap/scenes/group3.cpp
index b10e7975e5..98a4f6c454 100644
--- a/engines/gnap/scenes/group3.cpp
+++ b/engines/gnap/scenes/group3.cpp
@@ -68,7 +68,7 @@ void Scene30::run() {
 
 	_kidSequenceId = 0x101;
 	gnap.initPos(7, 12, kDirBottomRight);
-	plat.initPos(6, 12, kDirNone);
+	plat.initPos(6, 12, kDirIdleLeft);
 	_vm->endSceneInit();
 	gnap.walkTo(Common::Point(7, 8), -1, 0x107B9, 1);
 	plat.walkTo(Common::Point(6, 8), -1, 0x107C2, 1);
@@ -319,13 +319,13 @@ void Scene31::run() {
 
 	if (_vm->_prevSceneNum == 27) {
 		gnap.initPos(-1, 8, kDirBottomLeft);
-		plat.initPos(-1, 9, kDirUnk4);
+		plat.initPos(-1, 9, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(3, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(3, 9), -1, 0x107D2, 1);
 	} else {
 		gnap.initPos(7, 12, kDirBottomRight);
-		plat.initPos(6, 12, kDirNone);
+		plat.initPos(6, 12, kDirIdleLeft);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(7, 8), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(6, 8), -1, 0x107D2, 1);
@@ -675,13 +675,13 @@ void Scene32::run() {
 
 	if (_vm->_prevSceneNum == 33) {
 		gnap.initPos(11, 6, kDirBottomLeft);
-		plat.initPos(12, 6, kDirUnk4);
+		plat.initPos(12, 6, kDirIdleRight);
 		_vm->endSceneInit();
 		plat.walkTo(Common::Point(9, 6), -1, 0x107D2, 1);
 		gnap.walkTo(Common::Point(8, 6), -1, 0x107BA, 1);
 	} else {
 		gnap.initPos(1, 6, kDirBottomRight);
-		plat.initPos(1, 7, kDirNone);
+		plat.initPos(1, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
@@ -839,26 +839,26 @@ void Scene33::run() {
 	switch (_vm->_prevSceneNum) {
 	case 34:
 		gnap.initPos(11, 7, kDirBottomLeft);
-		plat.initPos(12, 7, kDirUnk4);
+		plat.initPos(12, 7, kDirIdleRight);
 		_vm->endSceneInit();
 		gnap.walkTo(Common::Point(8, 7), -1, 0x107BA, 1);
 		plat.walkTo(Common::Point(9, 7), -1, 0x107D2, 1);
 		break;
 	case 37:
 		gnap.initPos(7, 7, kDirBottomRight);
-		plat.initPos(8, 7, kDirNone);
+		plat.initPos(8, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		break;
 	case 32:
 		gnap.initPos(-1, 6, kDirBottomRight);
-		plat.initPos(-1, 7, kDirNone);
+		plat.initPos(-1, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		plat.walkTo(Common::Point(2, 7), -1, 0x107C2, 1);
 		gnap.walkTo(Common::Point(2, 8), -1, 0x107B9, 1);
 		break;
 	default:
 		gnap.initPos(3, 7, kDirBottomRight);
-		plat.initPos(2, 7, kDirNone);
+		plat.initPos(2, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 		break;
 	}
@@ -1142,10 +1142,10 @@ void Scene38::run() {
 
 	if (_vm->_prevSceneNum == 39) {
 		gnap.initPos(3, 7, kDirBottomLeft);
-		plat.initPos(4, 7, kDirUnk4);
+		plat.initPos(4, 7, kDirIdleRight);
 	} else {
 		gnap.initPos(3, 8, kDirBottomRight);
-		plat.initPos(4, 8, kDirNone);
+		plat.initPos(4, 8, kDirIdleLeft);
 	}
 	_vm->endSceneInit();
 
@@ -1372,7 +1372,7 @@ void Scene38::updateAnimations() {
 			gnap._sequenceDatNum = 0;
 			gameSys.setAnimation(0x9F, gnap._id, 0);
 			gnap._actionStatus = kAS38HoldingHuntingTrophy;
-			if (plat._idleFacing != kDirNone)
+			if (plat._idleFacing != kDirIdleLeft)
 				plat.playSequence(0x107D5);
 			else
 				plat.playSequence(0x107D4);
@@ -1448,7 +1448,7 @@ void Scene39::run() {
 		_vm->endSceneInit();
 	} else {
 		gnap.initPos(4, 7, kDirBottomRight);
-		plat.initPos(5, 7, kDirNone);
+		plat.initPos(5, 7, kDirIdleLeft);
 		_vm->endSceneInit();
 	}
 
diff --git a/engines/gnap/scenes/group4.cpp b/engines/gnap/scenes/group4.cpp
index b12d2ad4a1..f37be2c25d 100644
--- a/engines/gnap/scenes/group4.cpp
+++ b/engines/gnap/scenes/group4.cpp
@@ -1708,13 +1708,13 @@ void Scene44::run() {
 		case 50:
 			gnap.initPos(4, 8, kDirBottomRight);
 			if (_vm->_sceneSavegameLoaded) {
-				plat.initPos(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, kDirUnk4);
+				plat.initPos(_vm->_hotspotsWalkPos[4].x, _vm->_hotspotsWalkPos[4].y, kDirIdleRight);
 			} else if (!_vm->isFlag(kGFUnk13)) {
 				_vm->_timers[0] = 50;
 				_vm->_timers[1] = 20;
 				plat._pos = Common::Point(5, 8);
 				plat._sequenceId = 0xFD;
-				plat._idleFacing = kDirNone;
+				plat._idleFacing = kDirIdleLeft;
 				plat._id = 160;
 				plat._sequenceDatNum = 0;
 				gameSys.insertSequence(0xFD, 160, 0, 0, kSeqNone, 0, 0, 0);
@@ -2032,7 +2032,7 @@ void Scene44::updateAnimations() {
 	if (gameSys.getAnimationStatus(2) == 2) {
 		if (_nextKissingLadySequenceId == 0xF6) {
 			gameSys.insertSequence(_nextKissingLadySequenceId, 1, _currKissingLadySequenceId, 1, kSeqSyncWait, 0, 0, 0);
-			plat.initPos(5, 8, kDirNone);
+			plat.initPos(5, 8, kDirIdleLeft);
 			_currKissingLadySequenceId = _nextKissingLadySequenceId;
 			_nextKissingLadySequenceId = -1;
 			gameSys.setAnimation(0, 0, 2);
@@ -2162,7 +2162,7 @@ void Scene45::run() {
 		gameSys.setAnimation(0x9E, 1, 0);
 		gnap._actionStatus = 1;
 		gameSys.insertSequence(gnap._sequenceId, gnap._id, 0, 0, kSeqNone, 0, 0, 0);
-		plat.initPos(4, 8, kDirNone);
+		plat.initPos(4, 8, kDirIdleLeft);
 		_vm->endSceneInit();
 	} else if (_vm->_prevSceneNum == 46) {
 		gnap.initPos(-1, 8, kDirUpRight);