From 7b7021028676f61b0ff261c35ab8d6d5e86a118e Mon Sep 17 00:00:00 2001
From: Max Horn <max@quendi.de>
Date: Sat, 18 Sep 2004 22:09:34 +0000
Subject: [PATCH] renamed HE opcodes to distinguish them from their 'regular'
 V6/V7 counterparts

svn-id: r15173
---
 scumm/intern.h         |  72 +++++++++----------
 scumm/script_v6he.cpp  |  98 ++++++++++++-------------
 scumm/script_v72he.cpp |  46 ++++++------
 scumm/script_v7he.cpp  | 158 ++++++++++++++++++++---------------------
 scumm/script_v80he.cpp |  34 ++++-----
 scumm/script_v90he.cpp |  34 ++++-----
 6 files changed, 220 insertions(+), 222 deletions(-)

diff --git a/scumm/intern.h b/scumm/intern.h
index e6757a1030d..223770ace7b 100644
--- a/scumm/intern.h
+++ b/scumm/intern.h
@@ -587,24 +587,23 @@ protected:
 	void swapObjects(int object1, int object2);
 
 	/* HE version 60 script opcodes */
-	// TODO: Rename all these methods to use prefix "o6he_" instead of "o6_"
-	void o6_setState();
-	void o6_roomOps();
-	void o6_actorOps();
-	void o6_wait();
-	void o6_kernelSetFunctions();
-	void o6_kernelGetFunctions();
-	void o6_openFile();
-	void o6_closeFile();
-	void o6_deleteFile();
-	void o6_readFile();
-	void o6_rename();
-	void o6_writeFile();
-	void o6_soundOps();
-	void o6_seekFilePos();
-	void o6_localizeArray();
-	void o6_redimArray();
-	void o6_readFilePos();
+	void o6he_setState();
+	void o6he_roomOps();
+	void o6he_actorOps();
+	void o6he_wait();
+	void o6he_kernelSetFunctions();
+	void o6he_kernelGetFunctions();
+	void o6he_openFile();
+	void o6he_closeFile();
+	void o6he_deleteFile();
+	void o6he_readFile();
+	void o6he_rename();
+	void o6he_writeFile();
+	void o6he_soundOps();
+	void o6he_seekFilePos();
+	void o6he_localizeArray();
+	void o6he_redimArray();
+	void o6he_readFilePos();
 };
 
 class ScummEngine_v7he : public ScummEngine_v6he {
@@ -637,25 +636,24 @@ protected:
 	int polygonHit(int id, int x, int y);
 
 	/* HE version 70 script opcodes */
-	// TODO: Rename all these methods to use prefix "o70he_" instead of "o7_"
-	void o7_cursorCommand();
-	void o7_startSound();
-	void o7_pickupObject();
-	void o7_getActorRoom();
-	void o7_resourceRoutines();
-	void o7_quitPauseRestart();
-	void o7_kernelSetFunctions();
-	void o7_unknownED();
-	void o7_stringLen();
-	void o7_unknownEF();
-	void o7_readINI();
-	void o7_writeINI();
-	void o7_unknownF5();
-	void o7_unknownF6();
-	void o7_setFilePath();
-	void o7_unknownFA();
-	void o7_polygonOps();
-	void o7_polygonHit();
+	void o70he_cursorCommand();
+	void o70he_startSound();
+	void o70he_pickupObject();
+	void o70he_getActorRoom();
+	void o70he_resourceRoutines();
+	void o70he_quitPauseRestart();
+	void o70he_kernelSetFunctions();
+	void o70he_unknownED();
+	void o70he_stringLen();
+	void o70he_unknownEF();
+	void o70he_readINI();
+	void o70he_writeINI();
+	void o70he_unknownF5();
+	void o70he_unknownF6();
+	void o70he_setFilePath();
+	void o70he_unknownFA();
+	void o70he_polygonOps();
+	void o70he_polygonHit();
 };
 
 class ScummEngine_v72he : public ScummEngine_v7he {
diff --git a/scumm/script_v6he.cpp b/scumm/script_v6he.cpp
index c45ed38ddcf..3346ff76ac6 100644
--- a/scumm/script_v6he.cpp
+++ b/scumm/script_v6he.cpp
@@ -191,7 +191,7 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_setClass),
 		OPCODE(o6_getState),
 		/* 70 */
-		OPCODE(o6_setState),
+		OPCODE(o6he_setState),
 		OPCODE(o6_setOwner),
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
@@ -246,8 +246,8 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		OPCODE(o6_resourceRoutines),
 		/* 9C */
-		OPCODE(o6_roomOps),
-		OPCODE(o6_actorOps),
+		OPCODE(o6he_roomOps),
+		OPCODE(o6he_actorOps),
 		OPCODE(o6_verbOps),
 		OPCODE(o6_getActorFromXY),
 		/* A0 */
@@ -262,7 +262,7 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_pop),
 		/* A8 */
 		OPCODE(o6_getActorWidth),
-		OPCODE(o6_wait),
+		OPCODE(o6he_wait),
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
@@ -301,8 +301,8 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_distObjectPt),
 		OPCODE(o6_distPtPt),
 		/* C8 */
-		OPCODE(o6_kernelGetFunctions),
-		OPCODE(o6_kernelSetFunctions),
+		OPCODE(o6he_kernelGetFunctions),
+		OPCODE(o6he_kernelSetFunctions),
 		OPCODE(o6_delayFrames),
 		OPCODE(o6_pickOneOf),
 		/* CC */
@@ -322,18 +322,18 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_bor),
 		/* D8 */
 		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o6_closeFile),
-		OPCODE(o6_openFile),
-		OPCODE(o6_readFile),
+		OPCODE(o6he_closeFile),
+		OPCODE(o6he_openFile),
+		OPCODE(o6he_readFile),
 		/* DC */
-		OPCODE(o6_writeFile),
+		OPCODE(o6he_writeFile),
 		OPCODE(o6_findAllObjects),
-		OPCODE(o6_deleteFile),
-		OPCODE(o6_rename),
+		OPCODE(o6he_deleteFile),
+		OPCODE(o6he_rename),
 		/* E0 */
-		OPCODE(o6_soundOps),
+		OPCODE(o6he_soundOps),
 		OPCODE(o6_getPixel),
-		OPCODE(o6_localizeArray),
+		OPCODE(o6he_localizeArray),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -342,9 +342,9 @@ void ScummEngine_v6he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFilePos),
-		OPCODE(o6_redimArray),
-		OPCODE(o6_readFilePos),
+		OPCODE(o6he_seekFilePos),
+		OPCODE(o6he_redimArray),
+		OPCODE(o6he_readFilePos),
 		/* EC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -384,7 +384,7 @@ const char *ScummEngine_v6he::getOpcodeDesc(byte i) {
 	return _opcodesV6he[i].desc;
 }
 
-void ScummEngine_v6he::o6_setState() {
+void ScummEngine_v6he::o6he_setState() {
 	int state = pop();
 	int obj = pop();
 
@@ -402,7 +402,7 @@ void ScummEngine_v6he::o6_setState() {
 		clearDrawObjectQueue();
 }
 
-void ScummEngine_v6he::o6_roomOps() {
+void ScummEngine_v6he::o6he_roomOps() {
 	int a, b, c, d, e;
 	byte op;
 
@@ -512,7 +512,7 @@ void ScummEngine_v6he::o6_roomOps() {
 	case 187:		// SO_CYCLE_SPEED
 		b = pop();
 		a = pop();
-		checkRange(16, 1, a, "o6_roomOps: 187: color cycle out of range (%d)");
+		checkRange(16, 1, a, "o6he_roomOps: 187: color cycle out of range (%d)");
 		_colorCycle[a - 1].delay = (b != 0) ? 0x4000 / (b * 0x4C) : 0;
 		break;
 
@@ -541,10 +541,10 @@ void ScummEngine_v6he::o6_roomOps() {
 	case 236:		// HE 7.2
 		b = pop();
 		a = pop();
-		warning("o6_roomOps: case %d (%d, %d)", op, b, a);
+		warning("o6he_roomOps: case %d (%d, %d)", op, b, a);
 		break;
 	default:
-		error("o6_roomOps: default case %d", op);
+		error("o6he_roomOps: default case %d", op);
 	}
 }
 
@@ -574,7 +574,7 @@ void ScummEngine_v6he::swapObjects(int object1, int object2) {
 	memcpy(&_objs[idx2], &tmpOd, sizeof(tmpOd));
 }
 
-void ScummEngine_v6he::o6_actorOps() {
+void ScummEngine_v6he::o6he_actorOps() {
 	Actor *a;
 	int i, j, k;
 	int args[8];
@@ -586,7 +586,7 @@ void ScummEngine_v6he::o6_actorOps() {
 		return;
 	}
 
-	a = derefActorSafe(_curActor, "o6_actorOps");
+	a = derefActorSafe(_curActor, "o6he_actorOps");
 	if (!a)
 		return;
 
@@ -745,11 +745,11 @@ void ScummEngine_v6he::o6_actorOps() {
 		break;
 		}
 	default:
-		error("o6_actorOps: default case %d", b);
+		error("o6he_actorOps: default case %d", b);
 	}
 }
 
-void ScummEngine_v6he::o6_wait() {
+void ScummEngine_v6he::o6he_wait() {
 	int actnum;
 	int offs = -2;
 	Actor *a;
@@ -759,7 +759,7 @@ void ScummEngine_v6he::o6_wait() {
 	case 168:		// SO_WAIT_FOR_ACTOR Wait for actor
 		offs = fetchScriptWordSigned();
 		actnum = pop();
-		a = derefActor(actnum, "o6_wait:168");
+		a = derefActor(actnum, "o6he_wait:168");
 		if (a->moving)
 			break;
 		return;
@@ -781,14 +781,14 @@ void ScummEngine_v6he::o6_wait() {
 			return;
 		break;
 	default:
-		error("o6_wait: default case 0x%x", subOp);
+		error("o6he_wait: default case 0x%x", subOp);
 	}
 
 	_scriptPointer += offs;
 	o6_breakHere();
 }
 
-void ScummEngine_v6he::o6_kernelSetFunctions() {
+void ScummEngine_v6he::o6he_kernelSetFunctions() {
 	int args[29];
 	int num;
 
@@ -806,7 +806,7 @@ void ScummEngine_v6he::o6_kernelSetFunctions() {
 		//Used before mini games in 3DO versions, seems safe to ignore.
 		break;
 	default:
-		error("o6_kernelSetFunctions: default case %d (param count %d)", args[0], num);
+		error("o6he_kernelSetFunctions: default case %d (param count %d)", args[0], num);
 	}
 }
 
@@ -865,7 +865,7 @@ uint8 ScummEngine_v6he::virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
 	return decByte;
 }
 
-void ScummEngine_v6he::o6_kernelGetFunctions() {
+void ScummEngine_v6he::o6he_kernelGetFunctions() {
 	int args[29];
 	int retval;
 	ArrayHeader *ah;
@@ -883,7 +883,7 @@ void ScummEngine_v6he::o6_kernelGetFunctions() {
 		push(retval);
 		break;
 	default:
-		error("o6_kernelGetFunctions: default case %d", args[0]);
+		error("o6he_kernelGetFunctions: default case %d", args[0]);
 	}
 }
 
@@ -990,7 +990,7 @@ void ScummEngine_v6he::virtScreenSavePackByte(vsPackCtx *ctx, uint8 *&dst, int l
 	++ctx->size;	
 }
 
-void ScummEngine_v6he::o6_openFile() {
+void ScummEngine_v6he::o6he_openFile() {
 	int mode, len, slot, l, r;
 	byte filename[100];
 
@@ -1019,7 +1019,7 @@ void ScummEngine_v6he::o6_openFile() {
 		else if (mode == 2)
 			_hFileTable[slot].open((char*)filename + r, File::kFileWriteMode);
 		else
-			error("o6_openFile(): wrong open file mode");
+			error("o6he_openFile(): wrong open file mode");
 
 		if (_hFileTable[slot].isOpen() == false)
 			slot = -1;
@@ -1028,14 +1028,14 @@ void ScummEngine_v6he::o6_openFile() {
 	push(slot);
 }
 
-void ScummEngine_v6he::o6_closeFile() {
+void ScummEngine_v6he::o6he_closeFile() {
 	int slot = pop();
 	if (slot != -1)
 		if (_hFileTable[slot].isOpen() == true)
 			_hFileTable[slot].close();
 }
 
-void ScummEngine_v6he::o6_deleteFile() {
+void ScummEngine_v6he::o6he_deleteFile() {
 	int len, r;
 	byte filename[100];
 
@@ -1049,10 +1049,10 @@ void ScummEngine_v6he::o6_deleteFile() {
 			break;
 	}
 
-	debug(1, "stub o6_deleteFile(\"%s\")", filename + r);
+	debug(1, "stub o6he_deleteFile(\"%s\")", filename + r);
 }
 
-void ScummEngine_v6he::o6_rename() {
+void ScummEngine_v6he::o6he_rename() {
 	int len, r1, r2;
 	byte filename[100],filename2[100];
 
@@ -1076,7 +1076,7 @@ void ScummEngine_v6he::o6_rename() {
 			break;
 	}
 
-	debug(1, "stub o6_rename(\"%s\" to \"%s\")", filename + r1, filename2 + r2);
+	debug(1, "stub o6he_rename(\"%s\" to \"%s\")", filename + r1, filename2 + r2);
 }
 
 int ScummEngine_v6he::readFileToArray(int slot, int32 size) {
@@ -1091,7 +1091,7 @@ int ScummEngine_v6he::readFileToArray(int slot, int32 size) {
 	return readVar(0);
 }
 
-void ScummEngine_v6he::o6_readFile() {
+void ScummEngine_v6he::o6he_readFile() {
 	int32 size = pop();
 	int slot = pop();
 	int val;
@@ -1119,7 +1119,7 @@ void ScummEngine_v6he::writeFileFromArray(int slot, int resID) {
 	_hFileTable[slot].write(ah->data, size);
 }
 
-void ScummEngine_v6he::o6_writeFile() {
+void ScummEngine_v6he::o6he_writeFile() {
 	int32 size = pop();
 	int16 resID = pop();
 	int slot = pop();
@@ -1137,7 +1137,7 @@ void ScummEngine_v6he::o6_writeFile() {
 	}
 }
 
-void ScummEngine_v6he::o6_soundOps() {
+void ScummEngine_v6he::o6he_soundOps() {
 	byte subOp = fetchScriptByte();
 	int arg = pop();
 	switch (subOp) {
@@ -1151,23 +1151,23 @@ void ScummEngine_v6he::o6_soundOps() {
 		_sound->setOverrideFreq(arg);
 		break;
 	default:
-		error("o6_soundOps: default case 0x%x", subOp);
+		error("o6he_soundOps: default case 0x%x", subOp);
 	}
 }
 
 void ScummEngine_v6he::localizeArray(int slot, int script) {
 	if (slot >= _numArray)
-		error("o6_localizeArray(%d): array slot out of range", slot);
+		error("o6he_localizeArray(%d): array slot out of range", slot);
 
 	_arraySlot[slot] = vm.slot[_currentScript].number;
 }
 
-void ScummEngine_v6he::o6_localizeArray() {
+void ScummEngine_v6he::o6he_localizeArray() {
 	int slot = pop();
 	localizeArray(slot, vm.slot[_currentScript].number);
 }
 
-void ScummEngine_v6he::o6_seekFilePos() {
+void ScummEngine_v6he::o6he_seekFilePos() {
 	int mode, offset, slot;
 	mode = pop();
 	offset = pop();
@@ -1195,7 +1195,7 @@ void ScummEngine_v6he::seekFilePos(int slot, int offset, int mode) {
 	}
 }
 
-void ScummEngine_v6he::o6_readFilePos() {
+void ScummEngine_v6he::o6he_readFilePos() {
 	int slot = pop();
 
 	if (slot == -1) {
@@ -1206,7 +1206,7 @@ void ScummEngine_v6he::o6_readFilePos() {
 	push(_hFileTable[slot].pos());
 }
 
-void ScummEngine_v6he::o6_redimArray() {
+void ScummEngine_v6he::o6he_redimArray() {
 	int subcode, newX, newY;
 	newY = pop();
 	newX = pop();
@@ -1223,7 +1223,7 @@ void ScummEngine_v6he::o6_redimArray() {
 		redimArray(fetchScriptWord(), newX, newY, kByteArray);
 		break;
 	default:
-		error("o6_redimArray: default type %d", subcode);
+		error("o6he_redimArray: default type %d", subcode);
 	}
 }
 
diff --git a/scumm/script_v72he.cpp b/scumm/script_v72he.cpp
index b872dd1c43f..9b01ad91946 100644
--- a/scumm/script_v72he.cpp
+++ b/scumm/script_v72he.cpp
@@ -178,19 +178,19 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_cutscene),
 		OPCODE(o6_stopMusic),
 		OPCODE(o6_freezeUnfreeze),
-		OPCODE(o7_cursorCommand),
+		OPCODE(o70he_cursorCommand),
 		/* 6C */
 		OPCODE(o6_breakHere),
 		OPCODE(o6_ifClassOfIs),
 		OPCODE(o6_setClass),
 		OPCODE(o6_getState),
 		/* 70 */
-		OPCODE(o6_setState),
+		OPCODE(o6he_setState),
 		OPCODE(o6_setOwner),
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
 		/* 74 */
-		OPCODE(o7_startSound),
+		OPCODE(o70he_startSound),
 		OPCODE(o6_stopSound),
 		OPCODE(o6_startMusic),
 		OPCODE(o6_stopObjectScript),
@@ -210,7 +210,7 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_animateActor),
 		OPCODE(o6_doSentence),
 		/* 84 */
-		OPCODE(o7_pickupObject),
+		OPCODE(o70he_pickupObject),
 		OPCODE(o6_loadRoomWithEgo),
 		OPCODE(o6_invalid),
 		OPCODE(o6_getRandomNumber),
@@ -220,7 +220,7 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_getActorMoving),
 		OPCODE(o6_isScriptRunning),
 		/* 8C */
-		OPCODE(o7_getActorRoom),
+		OPCODE(o70he_getActorRoom),
 		OPCODE(o6_getObjectX),
 		OPCODE(o6_getObjectY),
 		OPCODE(o6_getObjectOldDir),
@@ -238,9 +238,9 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),
 		OPCODE(o6_invalid),
-		OPCODE(o7_resourceRoutines),
+		OPCODE(o70he_resourceRoutines),
 		/* 9C */
-		OPCODE(o6_roomOps),
+		OPCODE(o6he_roomOps),
 		OPCODE(o72_actorOps),
 		OPCODE(o72_verbOps),
 		OPCODE(o6_getActorFromXY),
@@ -256,13 +256,13 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_pop),
 		/* A8 */
 		OPCODE(o6_getActorWidth),
-		OPCODE(o6_wait),
+		OPCODE(o6he_wait),
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),
-		OPCODE(o7_quitPauseRestart),
+		OPCODE(o70he_quitPauseRestart),
 		OPCODE(o6_isActorInBox),
 		/* B0 */
 		OPCODE(o6_delay),
@@ -295,8 +295,8 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_distObjectPt),
 		OPCODE(o6_distPtPt),
 		/* C8 */
-		OPCODE(o6_kernelGetFunctions),
-		OPCODE(o7_kernelSetFunctions),
+		OPCODE(o6he_kernelGetFunctions),
+		OPCODE(o70he_kernelSetFunctions),
 		OPCODE(o6_delayFrames),
 		OPCODE(o6_pickOneOf),
 		/* CC */
@@ -316,18 +316,18 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_bor),
 		/* D8 */
 		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o6_closeFile),
+		OPCODE(o6he_closeFile),
 		OPCODE(o72_openFile),
 		OPCODE(o72_readFile),
 		/* DC */
 		OPCODE(o72_writeFile),
 		OPCODE(o72_findAllObjects),
 		OPCODE(o72_deleteFile),
-		OPCODE(o6_rename),
+		OPCODE(o6he_rename),
 		/* E0 */
-		OPCODE(o6_soundOps),
+		OPCODE(o6he_soundOps),
 		OPCODE(o72_getPixel),
-		OPCODE(o6_localizeArray),
+		OPCODE(o6he_localizeArray),
 		OPCODE(o72_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -336,13 +336,13 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFilePos),
+		OPCODE(o6he_seekFilePos),
 		OPCODE(o72_redimArray),
-		OPCODE(o6_readFilePos),
+		OPCODE(o6he_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
 		OPCODE(o72_unknownED),
-		OPCODE(o7_stringLen),
+		OPCODE(o70he_stringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
@@ -358,9 +358,9 @@ void ScummEngine_v72he::setupOpcodes() {
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_setFilePath),
 		OPCODE(o72_unknownFA),
-		OPCODE(o7_polygonOps),
+		OPCODE(o70he_polygonOps),
 		/* FC */
-		OPCODE(o7_polygonHit),
+		OPCODE(o70he_polygonHit),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -899,7 +899,7 @@ void ScummEngine_v72he::o72_actorOps() {
 		return;
 	}
 
-	a = derefActorSafe(_curActor, "o6_actorOps");
+	a = derefActorSafe(_curActor, "o6he_actorOps");
 	if (!a)
 		return;
 
@@ -1559,7 +1559,7 @@ void ScummEngine_v72he::o72_openFile() {
 		else if (mode == 2)
 			_hFileTable[slot].open((char*)filename + r, File::kFileWriteMode);
 		else
-			error("o6_openFile(): wrong open file mode %d", mode);
+			error("o6he_openFile(): wrong open file mode %d", mode);
 
 		if (_hFileTable[slot].isOpen() == false)
 			slot = -1;
@@ -1899,7 +1899,7 @@ void ScummEngine_v72he::o72_unknownF1() {
 	}
 
 	push (1);
-	debug(1,"o7_unknownF1 stub (%d, %d)", id, id2);
+	debug(1,"o70he_unknownF1 stub (%d, %d)", id, id2);
 }
 
 void ScummEngine_v72he::o72_checkGlobQueue() {
diff --git a/scumm/script_v7he.cpp b/scumm/script_v7he.cpp
index 12672550006..bc2807527cb 100644
--- a/scumm/script_v7he.cpp
+++ b/scumm/script_v7he.cpp
@@ -179,19 +179,19 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_cutscene),
 		OPCODE(o6_stopMusic),
 		OPCODE(o6_freezeUnfreeze),
-		OPCODE(o7_cursorCommand),
+		OPCODE(o70he_cursorCommand),
 		/* 6C */
 		OPCODE(o6_breakHere),
 		OPCODE(o6_ifClassOfIs),
 		OPCODE(o6_setClass),
 		OPCODE(o6_getState),
 		/* 70 */
-		OPCODE(o6_setState),
+		OPCODE(o6he_setState),
 		OPCODE(o6_setOwner),
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
 		/* 74 */
-		OPCODE(o7_startSound),
+		OPCODE(o70he_startSound),
 		OPCODE(o6_stopSound),
 		OPCODE(o6_startMusic),
 		OPCODE(o6_stopObjectScript),
@@ -211,7 +211,7 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_animateActor),
 		OPCODE(o6_doSentence),
 		/* 84 */
-		OPCODE(o7_pickupObject),
+		OPCODE(o70he_pickupObject),
 		OPCODE(o6_loadRoomWithEgo),
 		OPCODE(o6_invalid),
 		OPCODE(o6_getRandomNumber),
@@ -221,7 +221,7 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_getActorMoving),
 		OPCODE(o6_isScriptRunning),
 		/* 8C */
-		OPCODE(o7_getActorRoom),
+		OPCODE(o70he_getActorRoom),
 		OPCODE(o6_getObjectX),
 		OPCODE(o6_getObjectY),
 		OPCODE(o6_getObjectOldDir),
@@ -239,10 +239,10 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),
 		OPCODE(o6_invalid),
-		OPCODE(o7_resourceRoutines),
+		OPCODE(o70he_resourceRoutines),
 		/* 9C */
-		OPCODE(o6_roomOps),
-		OPCODE(o6_actorOps),
+		OPCODE(o6he_roomOps),
+		OPCODE(o6he_actorOps),
 		OPCODE(o6_verbOps),
 		OPCODE(o6_getActorFromXY),
 		/* A0 */
@@ -257,13 +257,13 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_pop),
 		/* A8 */
 		OPCODE(o6_getActorWidth),
-		OPCODE(o6_wait),
+		OPCODE(o6he_wait),
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
 		OPCODE(o6_invalid),
 		OPCODE(o6_isAnyOf),
-		OPCODE(o7_quitPauseRestart),
+		OPCODE(o70he_quitPauseRestart),
 		OPCODE(o6_isActorInBox),
 		/* B0 */
 		OPCODE(o6_delay),
@@ -296,8 +296,8 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_distObjectPt),
 		OPCODE(o6_distPtPt),
 		/* C8 */
-		OPCODE(o6_kernelGetFunctions),
-		OPCODE(o7_kernelSetFunctions),
+		OPCODE(o6he_kernelGetFunctions),
+		OPCODE(o70he_kernelSetFunctions),
 		OPCODE(o6_delayFrames),
 		OPCODE(o6_pickOneOf),
 		/* CC */
@@ -317,18 +317,18 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_bor),
 		/* D8 */
 		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o6_closeFile),
-		OPCODE(o6_openFile),
-		OPCODE(o6_readFile),
+		OPCODE(o6he_closeFile),
+		OPCODE(o6he_openFile),
+		OPCODE(o6he_readFile),
 		/* DC */
-		OPCODE(o6_writeFile),
+		OPCODE(o6he_writeFile),
 		OPCODE(o6_findAllObjects),
-		OPCODE(o6_deleteFile),
-		OPCODE(o6_rename),
+		OPCODE(o6he_deleteFile),
+		OPCODE(o6he_rename),
 		/* E0 */
-		OPCODE(o6_soundOps),
+		OPCODE(o6he_soundOps),
 		OPCODE(o6_getPixel),
-		OPCODE(o6_localizeArray),
+		OPCODE(o6he_localizeArray),
 		OPCODE(o6_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -337,31 +337,31 @@ void ScummEngine_v7he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFilePos),
-		OPCODE(o6_redimArray),
-		OPCODE(o6_readFilePos),
+		OPCODE(o6he_seekFilePos),
+		OPCODE(o6he_redimArray),
+		OPCODE(o6he_readFilePos),
 		/* EC */
 		OPCODE(o6_invalid),
-		OPCODE(o7_unknownED),
-		OPCODE(o7_stringLen),
-		OPCODE(o7_unknownEF),
+		OPCODE(o70he_unknownED),
+		OPCODE(o70he_stringLen),
+		OPCODE(o70he_unknownEF),
 		/* F0 */
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
-		OPCODE(o7_readINI),
+		OPCODE(o70he_readINI),
 		/* F4 */
-		OPCODE(o7_writeINI),
-		OPCODE(o7_unknownF5),
-		OPCODE(o7_unknownF6),
+		OPCODE(o70he_writeINI),
+		OPCODE(o70he_unknownF5),
+		OPCODE(o70he_unknownF6),
 		OPCODE(o6_invalid),
 		/* F8 */
 		OPCODE(o6_invalid),
-		OPCODE(o7_setFilePath),
-		OPCODE(o7_unknownFA),
-		OPCODE(o7_polygonOps),
+		OPCODE(o70he_setFilePath),
+		OPCODE(o70he_unknownFA),
+		OPCODE(o70he_polygonOps),
 		/* FC */
-		OPCODE(o7_polygonHit),
+		OPCODE(o70he_polygonHit),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
@@ -404,7 +404,7 @@ void ScummEngine_v7he::arrrays_unk2(int dst, int src, int len2, int len) {
 	writeArray(0, 0, edi + i, 0);
 }
 
-void ScummEngine_v7he::o7_cursorCommand() {
+void ScummEngine_v7he::o70he_cursorCommand() {
 	int a, i;
 	int args[16];
 	int subOp = fetchScriptByte();
@@ -459,14 +459,14 @@ void ScummEngine_v7he::o7_cursorCommand() {
 		setCursorTransparency(pop());
 		break;
 	default:
-		error("o7_cursorCommand: default case %x", subOp);
+		error("o70he_cursorCommand: default case %x", subOp);
 	}
 
 	VAR(VAR_CURSORSTATE) = _cursor.state;
 	VAR(VAR_USERPUT) = _userPut;
 }
 
-void ScummEngine_v7he::o7_startSound() {
+void ScummEngine_v7he::o70he_startSound() {
 	byte op;
 	op = fetchScriptByte();
 
@@ -475,7 +475,7 @@ void ScummEngine_v7he::o7_startSound() {
 		_heSndLoop |= 4;
 		break;
 	case 23:
-		debug(1,"o7_startSound: case 29 (%d, %d, %d)", pop(), pop(), pop());
+		debug(1,"o70he_startSound: case 29 (%d, %d, %d)", pop(), pop(), pop());
 		break;
 	case 56:
 		_heSndLoop |= 2;
@@ -509,16 +509,16 @@ void ScummEngine_v7he::o7_startSound() {
 	case 255:
 		// _sound->addSoundToQueue(_heSndSoundId, _heSndOffset, _heSndChannel, _heSndLoop);
 		_sound->addSoundToQueue(_heSndSoundId, _heSndOffset);
-		debug(2, "o7_startSound stub (%d, %d, %d, %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndLoop);
+		debug(2, "o70he_startSound stub (%d, %d, %d, %d)", _heSndSoundId, _heSndOffset, _heSndChannel, _heSndLoop);
 		_heSndLoop = 0;
 		break;
 
 	default:
-		error("o7_startSound invalid case %d", op);
+		error("o70he_startSound invalid case %d", op);
 	}
 }
 
-void ScummEngine_v7he::o7_pickupObject() {
+void ScummEngine_v7he::o70he_pickupObject() {
 	int obj, room;
 
 	room = pop();
@@ -537,17 +537,17 @@ void ScummEngine_v7he::o7_pickupObject() {
 	runInventoryScript(obj);									/* Difference */
 }
 
-void ScummEngine_v7he::o7_getActorRoom() {
+void ScummEngine_v7he::o70he_getActorRoom() {
 	int act = pop();
 
 	if (act < _numActors) {
-		Actor *a = derefActor(act, "o7_getActorRoom");
+		Actor *a = derefActor(act, "o70he_getActorRoom");
 		push(a->room);
 	} else
 		push(getObjectRoom(act));
 }
 
-void ScummEngine_v7he::o7_resourceRoutines() {
+void ScummEngine_v7he::o70he_resourceRoutines() {
 	int resid, op;
 	op = fetchScriptByte();
 
@@ -665,18 +665,18 @@ void ScummEngine_v7he::o7_resourceRoutines() {
 		break;
 	case 233:
 		resid = pop();
-		debug(5,"stub o7_resourceRoutines lock object %d", resid);
+		debug(5,"stub o70he_resourceRoutines lock object %d", resid);
 		break;
 	case 235:
 		resid = pop();
-		debug(5,"stub o7_resourceRoutines unlock object %d", resid);
+		debug(5,"stub o70he_resourceRoutines unlock object %d", resid);
 		break;
 	default:
-		debug(1,"o7_resourceRoutines: default case %d", op);
+		debug(1,"o70he_resourceRoutines: default case %d", op);
 	}
 }
 
-void ScummEngine_v7he::o7_quitPauseRestart() {
+void ScummEngine_v7he::o70he_quitPauseRestart() {
 	byte subOp = fetchScriptByte();
 	int par1;
 
@@ -690,24 +690,24 @@ void ScummEngine_v7he::o7_quitPauseRestart() {
 		break;
 	case 250:
 		par1 = pop();
-		warning("stub: o7_quitPauseRestart subOpcode %d", subOp);
+		warning("stub: o70he_quitPauseRestart subOpcode %d", subOp);
 		break;
 	case 253:
 		par1 = pop();
-		warning("stub: o7_quitPauseRestart subOpcode %d", subOp);
+		warning("stub: o70he_quitPauseRestart subOpcode %d", subOp);
 	case 244:		// SO_QUIT
 		shutDown();
 		break;
 	case 251:
 	case 252:
-		warning("stub: o7_quitPauseRestart subOpcode %d", subOp);
+		warning("stub: o70he_quitPauseRestart subOpcode %d", subOp);
 		break;
 	default:
-		warning("o7_quitPauseRestart invalid case %d", subOp);
+		warning("o70he_quitPauseRestart invalid case %d", subOp);
 	}
 }
 
-void ScummEngine_v7he::o7_unknownED() {
+void ScummEngine_v7he::o70he_unknownED() {
 	int array, pos, len;
 	int chr, result = 0;
 
@@ -728,17 +728,17 @@ void ScummEngine_v7he::o7_unknownED() {
 	}
 
 	push(result);
-	debug(1,"stub o7_unknownED");
+	debug(1,"stub o70he_unknownED");
 }
 
-void ScummEngine_v7he::o7_kernelSetFunctions() {
+void ScummEngine_v7he::o70he_kernelSetFunctions() {
 	int args[29];
 	int num;
 	Actor *a;
 
 	num = getStackList(args, ARRAYSIZE(args));
 
-	debug(1, "o7_kernelSetFunctions: case %d (param count %d)", args[0], num);
+	debug(1, "o70he_kernelSetFunctions: case %d (param count %d)", args[0], num);
 	switch (args[0]) {
 	case 1:
 		// Used to restore images when decorating cake in
@@ -746,7 +746,7 @@ void ScummEngine_v7he::o7_kernelSetFunctions() {
 		virtScreenLoad(args[1], args[2], args[3], args[4], args[5]);
 		break;
 	case 20: // HE72+
-		a = derefActor(args[1], "o7_kernelSetFunctions: 20");
+		a = derefActor(args[1], "o70he_kernelSetFunctions: 20");
 		queueAuxBlock(a);
 		break;
 	case 21:
@@ -768,7 +768,7 @@ void ScummEngine_v7he::o7_kernelSetFunctions() {
 		_fullRedraw = 1;
 		break;
 	case 30:
-		a = derefActor(args[1], "o7_kernelSetFunctions: 30");
+		a = derefActor(args[1], "o70he_kernelSetFunctions: 30");
 		a->clipOverride.bottom = args[2];
 		break;
 	case 42:
@@ -780,11 +780,11 @@ void ScummEngine_v7he::o7_kernelSetFunctions() {
 	case 714:
 		break;
 	default:
-		error("o7_kernelSetFunctions: default case %d (param count %d)", args[0], num);
+		error("o70he_kernelSetFunctions: default case %d (param count %d)", args[0], num);
 	}
 }
 
-void ScummEngine_v7he::o7_stringLen() {
+void ScummEngine_v7he::o70he_stringLen() {
 	int id, len;
 	byte *addr;
 
@@ -792,13 +792,13 @@ void ScummEngine_v7he::o7_stringLen() {
 
 	addr = getStringAddress(id);
 	if (!addr)
-		error("o7_stringLen: Reference to zeroed array pointer (%d)", id);
+		error("o70he_stringLen: Reference to zeroed array pointer (%d)", id);
 
 	len = resStrLen(getStringAddress(id));
 	push(len);
 }
 
-void ScummEngine_v7he::o7_unknownEF() {
+void ScummEngine_v7he::o70he_unknownEF() {
 	int dst, size;
 	int b = pop();
 	int a = pop();
@@ -815,10 +815,10 @@ void ScummEngine_v7he::o7_unknownEF() {
 	arrrays_unk2(dst, src, a, b);
 
 	push(dst);
-	debug(1,"stub o7_unknownEF");
+	debug(1,"stub o70he_unknownEF");
 }
 
-void ScummEngine_v7he::o7_readINI() {
+void ScummEngine_v7he::o70he_readINI() {
 	int len;
 	int type;
 	int retval;
@@ -847,11 +847,11 @@ void ScummEngine_v7he::o7_readINI() {
 		push(retval); // var ID string
 		break;
 	default:
-		error("o7_readINI: default type %d", type);
+		error("o70he_readINI: default type %d", type);
 	}
 }
 
-void ScummEngine_v7he::o7_writeINI() {
+void ScummEngine_v7he::o70he_writeINI() {
 	int type, value;
 	byte option[256], option2[256];
 	int len;
@@ -865,20 +865,20 @@ void ScummEngine_v7he::o7_writeINI() {
 
 	switch (type) {
 	case 1: // number
-		debug(1, "o7_writeINI: %s set to %d", option, value);
+		debug(1, "o70he_writeINI: %s set to %d", option, value);
 		break;
 	case 2: // string
 		addMessageToStack(_scriptPointer, option2, sizeof(option2));
 		len = resStrLen(_scriptPointer);
 		_scriptPointer += len + 1;
-		debug(1, "o7_writeINI: %s set to %s", option, option2);
+		debug(1, "o70he_writeINI: %s set to %s", option, option2);
 		break;
 	default:
-		error("o7_writeINI: default type %d", type);
+		error("o70he_writeINI: default type %d", type);
 	}
 }
 
-void ScummEngine_v7he::o7_unknownF5() {
+void ScummEngine_v7he::o70he_unknownF5() {
 	int chr, max;
 	int array, len, pos, result = 0;
 	max = pop();
@@ -899,10 +899,10 @@ void ScummEngine_v7he::o7_unknownF5() {
 	}
 
 	push(len);
-	debug(1,"stub o7_unknownF5 (%d)", result);
+	debug(1,"stub o70he_unknownF5 (%d)", result);
 }
 
-void ScummEngine_v7he::o7_unknownF6() {
+void ScummEngine_v7he::o70he_unknownF6() {
 	int len, edi, pos, value, id;
 	value = pop();
 	edi = pop();
@@ -940,10 +940,10 @@ void ScummEngine_v7he::o7_unknownF6() {
 	}
 
 	push(-1);
-	debug(1,"stub o7_unknownF6");
+	debug(1,"stub o70he_unknownF6");
 }
 
-void ScummEngine_v7he::o7_setFilePath() {
+void ScummEngine_v7he::o70he_setFilePath() {
 	// File related
 	int len;
 	byte filename[100];
@@ -953,17 +953,17 @@ void ScummEngine_v7he::o7_setFilePath() {
 	len = resStrLen(_scriptPointer);
 	_scriptPointer += len + 1;
 
-	debug(1,"stub o7_setFilePath(%s)", filename);
+	debug(1,"stub o70he_setFilePath(%s)", filename);
 }
 
-void ScummEngine_v7he::o7_unknownFA() {
+void ScummEngine_v7he::o70he_unknownFA() {
 	int num = fetchScriptByte();
 	int len = resStrLen(_scriptPointer);
-	debug(1,"stub o7_unknownFA(%d, \"%s\")", num, _scriptPointer);
+	debug(1,"stub o70he_unknownFA(%d, \"%s\")", num, _scriptPointer);
 	_scriptPointer += len + 1;
 }
 
-void ScummEngine_v7he::o7_polygonOps() {
+void ScummEngine_v7he::o70he_polygonOps() {
 	byte b;
 	b = fetchScriptByte();
 	int vert1x, vert1y, vert2x, vert2y, vert3x, vert3y, vert4x, vert4y;
@@ -1042,7 +1042,7 @@ void ScummEngine_v7he::polygonErase(int fromId, int toId) {
 	}
 }
 
-void ScummEngine_v7he::o7_polygonHit() {
+void ScummEngine_v7he::o70he_polygonHit() {
 	int y = pop();
 	int x = pop();
 
diff --git a/scumm/script_v80he.cpp b/scumm/script_v80he.cpp
index 5dbb775d31f..2a49fc45a27 100644
--- a/scumm/script_v80he.cpp
+++ b/scumm/script_v80he.cpp
@@ -190,7 +190,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
 		/* 74 */
-		OPCODE(o7_startSound),
+		OPCODE(o70he_startSound),
 		OPCODE(o6_stopSound),
 		OPCODE(o6_startMusic),
 		OPCODE(o6_stopObjectScript),
@@ -210,7 +210,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_animateActor),
 		OPCODE(o6_doSentence),
 		/* 84 */
-		OPCODE(o7_pickupObject),
+		OPCODE(o70he_pickupObject),
 		OPCODE(o6_loadRoomWithEgo),
 		OPCODE(o6_invalid),
 		OPCODE(o6_getRandomNumber),
@@ -220,7 +220,7 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_getActorMoving),
 		OPCODE(o6_isScriptRunning),
 		/* 8C */
-		OPCODE(o7_getActorRoom),
+		OPCODE(o70he_getActorRoom),
 		OPCODE(o6_getObjectX),
 		OPCODE(o6_getObjectY),
 		OPCODE(o6_getObjectOldDir),
@@ -238,9 +238,9 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),
 		OPCODE(o6_invalid),
-		OPCODE(o7_resourceRoutines),
+		OPCODE(o70he_resourceRoutines),
 		/* 9C */
-		OPCODE(o6_roomOps),
+		OPCODE(o6he_roomOps),
 		OPCODE(o72_actorOps),
 		OPCODE(o72_verbOps),
 		OPCODE(o6_getActorFromXY),
@@ -256,13 +256,13 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_pop),
 		/* A8 */
 		OPCODE(o6_getActorWidth),
-		OPCODE(o6_wait),
+		OPCODE(o6he_wait),
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
 		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),
-		OPCODE(o7_quitPauseRestart),
+		OPCODE(o70he_quitPauseRestart),
 		OPCODE(o6_isActorInBox),
 		/* B0 */
 		OPCODE(o6_delay),
@@ -295,8 +295,8 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_distObjectPt),
 		OPCODE(o6_distPtPt),
 		/* C8 */
-		OPCODE(o6_kernelGetFunctions),
-		OPCODE(o7_kernelSetFunctions),
+		OPCODE(o6he_kernelGetFunctions),
+		OPCODE(o70he_kernelSetFunctions),
 		OPCODE(o6_delayFrames),
 		OPCODE(o6_pickOneOf),
 		/* CC */
@@ -316,18 +316,18 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_bor),
 		/* D8 */
 		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o6_closeFile),
+		OPCODE(o6he_closeFile),
 		OPCODE(o72_openFile),
 		OPCODE(o72_readFile),
 		/* DC */
 		OPCODE(o72_writeFile),
 		OPCODE(o72_findAllObjects),
 		OPCODE(o72_deleteFile),
-		OPCODE(o6_rename),
+		OPCODE(o6he_rename),
 		/* E0 */
 		OPCODE(o6_invalid),
 		OPCODE(o72_getPixel),
-		OPCODE(o6_localizeArray),
+		OPCODE(o6he_localizeArray),
 		OPCODE(o80_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -336,13 +336,13 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFilePos),
+		OPCODE(o6he_seekFilePos),
 		OPCODE(o72_redimArray),
-		OPCODE(o6_readFilePos),
+		OPCODE(o6he_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
 		OPCODE(o72_unknownED),
-		OPCODE(o7_stringLen),
+		OPCODE(o70he_stringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
@@ -358,9 +358,9 @@ void ScummEngine_v80he::setupOpcodes() {
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_setFilePath),
 		OPCODE(o72_unknownFA),
-		OPCODE(o7_polygonOps),
+		OPCODE(o70he_polygonOps),
 		/* FC */
-		OPCODE(o7_polygonHit),
+		OPCODE(o70he_polygonHit),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
diff --git a/scumm/script_v90he.cpp b/scumm/script_v90he.cpp
index 26c0342eab3..adf02179bf3 100644
--- a/scumm/script_v90he.cpp
+++ b/scumm/script_v90he.cpp
@@ -190,7 +190,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_getOwner),
 		OPCODE(o6_jump),
 		/* 74 */
-		OPCODE(o7_startSound),
+		OPCODE(o70he_startSound),
 		OPCODE(o6_stopSound),
 		OPCODE(o6_startMusic),
 		OPCODE(o6_stopObjectScript),
@@ -210,7 +210,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_animateActor),
 		OPCODE(o6_doSentence),
 		/* 84 */
-		OPCODE(o7_pickupObject),
+		OPCODE(o70he_pickupObject),
 		OPCODE(o6_loadRoomWithEgo),
 		OPCODE(o6_invalid),
 		OPCODE(o6_getRandomNumber),
@@ -220,7 +220,7 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_getActorMoving),
 		OPCODE(o6_isScriptRunning),
 		/* 8C */
-		OPCODE(o7_getActorRoom),
+		OPCODE(o70he_getActorRoom),
 		OPCODE(o6_getObjectX),
 		OPCODE(o6_getObjectY),
 		OPCODE(o6_getObjectOldDir),
@@ -238,9 +238,9 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_isSoundRunning),
 		OPCODE(o6_setBoxFlags),
 		OPCODE(o6_invalid),
-		OPCODE(o7_resourceRoutines),
+		OPCODE(o70he_resourceRoutines),
 		/* 9C */
-		OPCODE(o6_roomOps),
+		OPCODE(o6he_roomOps),
 		OPCODE(o72_actorOps),
 		OPCODE(o90_unknown9E),
 		OPCODE(o6_getActorFromXY),
@@ -256,13 +256,13 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_pop),
 		/* A8 */
 		OPCODE(o6_getActorWidth),
-		OPCODE(o6_wait),
+		OPCODE(o6he_wait),
 		OPCODE(o6_getActorScaleX),
 		OPCODE(o6_getActorAnimCounter1),
 		/* AC */
 		OPCODE(o80_drawWizPolygon),
 		OPCODE(o6_isAnyOf),
-		OPCODE(o7_quitPauseRestart),
+		OPCODE(o70he_quitPauseRestart),
 		OPCODE(o6_isActorInBox),
 		/* B0 */
 		OPCODE(o6_delay),
@@ -295,8 +295,8 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_distObjectPt),
 		OPCODE(o6_distPtPt),
 		/* C8 */
-		OPCODE(o6_kernelGetFunctions),
-		OPCODE(o7_kernelSetFunctions),
+		OPCODE(o6he_kernelGetFunctions),
+		OPCODE(o70he_kernelSetFunctions),
 		OPCODE(o6_delayFrames),
 		OPCODE(o6_pickOneOf),
 		/* CC */
@@ -316,18 +316,18 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_bor),
 		/* D8 */
 		OPCODE(o6_isRoomScriptRunning),
-		OPCODE(o6_closeFile),
+		OPCODE(o6he_closeFile),
 		OPCODE(o72_openFile),
 		OPCODE(o72_readFile),
 		/* DC */
 		OPCODE(o72_writeFile),
 		OPCODE(o72_findAllObjects),
 		OPCODE(o72_deleteFile),
-		OPCODE(o6_rename),
+		OPCODE(o6he_rename),
 		/* E0 */
 		OPCODE(o6_invalid),
 		OPCODE(o72_getPixel),
-		OPCODE(o6_localizeArray),
+		OPCODE(o6he_localizeArray),
 		OPCODE(o80_pickVarRandom),
 		/* E4 */
 		OPCODE(o6_setBoxSet),
@@ -336,13 +336,13 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o6_invalid),
 		/* E8 */
 		OPCODE(o6_invalid),
-		OPCODE(o6_seekFilePos),
+		OPCODE(o6he_seekFilePos),
 		OPCODE(o72_redimArray),
-		OPCODE(o6_readFilePos),
+		OPCODE(o6he_readFilePos),
 		/* EC */
 		OPCODE(o72_unknownEC),
 		OPCODE(o72_unknownED),
-		OPCODE(o7_stringLen),
+		OPCODE(o70he_stringLen),
 		OPCODE(o72_unknownEF),
 		/* F0 */
 		OPCODE(o72_unknownF0),
@@ -358,9 +358,9 @@ void ScummEngine_v90he::setupOpcodes() {
 		OPCODE(o72_unknownF8),
 		OPCODE(o72_setFilePath),
 		OPCODE(o72_unknownFA),
-		OPCODE(o7_polygonOps),
+		OPCODE(o70he_polygonOps),
 		/* FC */
-		OPCODE(o7_polygonHit),
+		OPCODE(o70he_polygonHit),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),
 		OPCODE(o6_invalid),