MADS: Replace several verbs with their friendly names

9 files changed, 194 insertions, 181 deletions

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index ac983633cc..674e785a50 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -42,31 +42,44 @@ enum Verb {
 	VERB_CAST           = 0x03D,
 	VERB_CLIMB_DOWN     = 0x04E,
 	VERB_CLIMB_UP       = 0x050,
-	VERB_EAT			= 0x075,
-	VERB_EXAMINE		= 0x07D,
-	VERB_HOSE_DOWN		= 0x0A6,
-	VERB_IGNITE			= 0x0B4,
-	VERB_INFLATE		= 0x0B5,
-	VERB_INSERT			= 0x0B6,
-	VERB_INSPECT		= 0x0B7,
-	VERB_HURL			= 0x0A9,
-	VERB_LOOK_AT		= 0x0D1,
-	VERB_LOOK_IN		= 0x0D2,
-	VERB_LOOK_THROUGH	= 0x0D3,
-	VERB_PEER_THROUGH	= 0x103,
+	VERB_DIVE_INTO      = 0x06D,
+	VERB_EAT            = 0x075,
+	VERB_EXAMINE        = 0x07D,
+	VERB_HOSE_DOWN      = 0x0A6,
+	VERB_IGNITE         = 0x0B4,
+	VERB_INFLATE        = 0x0B5,
+	VERB_INSERT         = 0x0B6,
+	VERB_INSPECT        = 0x0B7,
+	VERB_HURL           = 0x0A9,
+	VERB_LOOK_AT        = 0x0D1,
+	VERB_LOOK_IN        = 0x0D2,
+	VERB_LOOK_THROUGH   = 0x0D3,
+	VERB_PEER_THROUGH   = 0x103,
+	VERB_PLAY           = 0x112,
 	VERB_PRESS          = 0x11A,
-	VERB_READ			= 0x11F,
+	VERB_READ           = 0x11F,
 	VERB_SHOOT          = 0x13A,
 	VERB_SIT_IN         = 0x13F,
-	VERB_SMELL			= 0x147,
+	VERB_SMELL          = 0x147,
+	VERB_STARE_AT       = 0x155,
+	VERB_SWIM_INTO      = 0x15A,
+	VERB_SWIM_THROUGH   = 0x15B,
+	VERB_SWIM_TO        = 0x15C,
+	VERB_SWIM_TOWARDS   = 0x15D,
+	VERB_SWIM_UNDER     = 0x15E,
 	VERB_WALK_INSIDE    = 0x188,
 	VERB_WALK_THROUGH   = 0x18B,
 	VERB_WALK_TOWARDS   = 0x18C,
 	VERB_WALK_DOWN      = 0x1AD,
 	VERB_EXIT_FROM      = 0x1CE,
+	VERB_EXIT           = 0x298,
 	VERB_CLIMB_INTO     = 0x2F7,
 	VERB_STEP_INTO      = 0x2F9,
-	VERB_WALK_ALONG     = 0x312
+	VERB_SIT_ON         = 0x30B,
+	VERB_WALK_ALONG     = 0x312,
+	VERB_ENTER          = 0x3B8,
+	VERB_INSTALL        = 0x474,
+	VERB_REMOVE         = 0x476
 };
 
 enum Noun {
diff --git a/engines/mads/nebular/nebular_scenes1.cpp b/engines/mads/nebular/nebular_scenes1.cpp
index 025d5510bf..c2765ea4d2 100644
--- a/engines/mads/nebular/nebular_scenes1.cpp
+++ b/engines/mads/nebular/nebular_scenes1.cpp
@@ -481,7 +481,7 @@ void Scene101::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0xA8) || _action.isAction(VERB_LOOK, 0xF8) || _action.isAction(0x7D, 0xA8) || _action.isAction(0x7D, 0xF8)) {
+	if (_action.isAction(VERB_LOOK, 0xA8) || _action.isAction(VERB_LOOK, 0xF8) || _action.isAction(VERB_EXAMINE, 0xA8) || _action.isAction(VERB_EXAMINE, 0xF8)) {
 		_vm->_dialogs->show(10103);
 		_action._inProgress = false;
 		return;
@@ -493,7 +493,7 @@ void Scene101::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0xE1) || _action.isAction(0xD2, 0xE1)) {
+	if (_action.isAction(VERB_LOOK, 0xE1) || _action.isAction(VERB_LOOK_IN, 0xE1)) {
 		_vm->_dialogs->show(10105);
 		_action._inProgress = false;
 		return;
@@ -595,7 +595,7 @@ void Scene101::actions() {
 		return;
 	}
 
-	if ((_action.isAction(VERB_LOOK) || _action.isAction(0x112)) && _action.isAction(0x17E)) {
+	if ((_action.isAction(VERB_LOOK) || _action.isAction(VERB_PLAY)) && _action.isAction(0x17E)) {
 		_vm->_dialogs->show(10124);
 		_action._inProgress = false;
 		return;
@@ -875,7 +875,7 @@ void Scene102::actions() {
 		return;
 	}
 
-	if (_action.isAction(0x18B, 0x6E)) {
+	if (_action.isAction(VERB_WALK_THROUGH, 0x6E)) {
 		switch (_game._trigger) {
 		case 0:
 			_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 6, 1, 0, 0);
@@ -922,13 +922,13 @@ void Scene102::actions() {
 		return;
 	}
 
-	if (_action.isAction(0x155, 0x46) || _action.isAction(VERB_LOOK, 0x46)) {
+	if (_action.isAction(VERB_STARE_AT, 0x46) || _action.isAction(VERB_LOOK, 0x46)) {
 		_vm->_dialogs->show(10203);
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_action.isAction(0x155, 0xFD) || _action.isAction(VERB_LOOK, 0xFD)) {
+	if (_action.isAction(VERB_STARE_AT, 0xFD) || _action.isAction(VERB_LOOK, 0xFD)) {
 		_vm->_dialogs->show(10202);
 		_action._inProgress = false;
 		return;
@@ -970,9 +970,9 @@ void Scene102::actions() {
 		return;
 	}
 
-	if ((_action.isObject(0xC7) || _action.isObject(0xA3)) && (_action.isAction(VERB_LOOK) || _action.isAction(0x50) || _action.isAction(0x4F))) {
+	if ((_action.isObject(0xC7) || _action.isObject(0xA3)) && (_action.isAction(VERB_LOOK) || _action.isAction(VERB_CLIMB_UP) || _action.isAction(0x4F))) {
 		if (_game._objects.isInInventory(OBJ_REBREATHER)) {
-			if (!_action.isAction(0x50) && !_action.isAction(0x4F)) {
+			if (!_action.isAction(VERB_CLIMB_UP) && !_action.isAction(0x4F)) {
 				_vm->_dialogs->show(10231);
 				_action._inProgress = false;
 				return;
@@ -984,7 +984,7 @@ void Scene102::actions() {
 		}
 	}
 
-	if ((_action.isObject(0xC7) || _action.isObject(0xA3)) && (_action.isAction(0x50) || _action.isAction(0x4F)) ) {
+	if ((_action.isObject(0xC7) || _action.isObject(0xA3)) && (_action.isAction(VERB_CLIMB_UP) || _action.isAction(0x4F)) ) {
 		switch (_game._trigger) {
 		case 0:
 			_scene->loadAnimation(formAnimName('A', -1), 1);
@@ -1025,7 +1025,7 @@ void Scene102::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0x197) || _action.isAction(0xD3, 0x197)) {
+	if (_action.isAction(VERB_LOOK, 0x197) || _action.isAction(VERB_LOOK_THROUGH, 0x197)) {
 		_vm->_dialogs->show(10227);
 		_action._inProgress = false;
 		return;
@@ -1056,14 +1056,14 @@ void Scene102::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0x47) || (_action.isAction(0x13F, 0x47) && !_chairDescrFl)) {
+	if (_action.isAction(VERB_LOOK, 0x47) || (_action.isAction(VERB_SIT_IN, 0x47) && !_chairDescrFl)) {
 		_chairDescrFl = true;
 		_vm->_dialogs->show(10210);
 		_action._inProgress = false;
 		return;
 	}
 
-	if (_action.isAction(0x13F, 0x47)) {
+	if (_action.isAction(VERB_SIT_IN, 0x47)) {
 		_vm->_dialogs->show(10211);
 		_action._inProgress = false;
 		return;
@@ -1716,10 +1716,10 @@ void Scene104::step() {
 }
 
 void Scene104::preActions() {
-	if (_action.isAction(0x15D, 0x74))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0x74))
 		_game._player._walkOffScreenSceneId = 105;
 
-	if (_action.isAction(0x15D, 0x75))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0x75))
 		_game._player._walkOffScreenSceneId = 106;
 }
 
@@ -1843,10 +1843,10 @@ void Scene105::step() {
 }
 
 void Scene105::preActions() {
-	if (_action.isAction(0x15D, 0x195))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0x195))
 		_game._player._walkOffScreenSceneId = 104;
 
-	if (_action.isAction(0x15D, 0xF5))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0xF5))
 		_game._player._walkOffScreenSceneId = 107;
 
 	if (_action.isAction(0xE0) && (_action.isAction(VERB_TALKTO) || _action.isAction(VERB_LOOK)))
@@ -2052,20 +2052,20 @@ void Scene106::step() {
 }
 
 void Scene106::preActions() {
-	if (_action.isAction(0x15D, 0x12E) || _action.isAction(0x15D, 0x130)) {
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0x12E) || _action.isAction(VERB_SWIM_TOWARDS, 0x130)) {
 		_game._player._stepEnabled = false;
 		_scene->_sprites[_game._player._spritesStart + 1]->_charInfo->_velocity = 24;
 		_game._player._walkOffScreenSceneId = 104;
 	}
 
-	if (_action.isAction(0x15D, 0xF3))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0xF3))
 		_game._player._walkOffScreenSceneId = 107;
 }
 
 void Scene106::actions() {
 	if (_action._lookFlag)
 		_vm->_dialogs->show(10614);
-	else if (_action.isAction(0x15C, 0xD9)) {
+	else if (_action.isAction(VERB_SWIM_TO, 0xD9)) {
 		_game._player._stepEnabled = false;
 		_game._player._prepareWalkPos = Common::Point(95, 72);
 		_game._player._prepareWalkFacing = FACING_WEST;
@@ -2073,7 +2073,7 @@ void Scene106::actions() {
 		_game._player._readyToWalk = true;
 		_game._player._frameNumber = 9;
 		_backToShipFl = true;
-	} else if (_action.isAction(VERB_LOOK, 0x13) || _action.isAction(0xD1, 0x13))
+	} else if (_action.isAction(VERB_LOOK, 0x13) || _action.isAction(VERB_LOOK_AT, 0x13))
 		_vm->_dialogs->show(10601);
 	else if (_action.isAction(VERB_TAKE, 0x13))
 		_vm->_dialogs->show(10602);
@@ -2083,11 +2083,11 @@ void Scene106::actions() {
 		_vm->_dialogs->show(10604);
 	else if (_action.isAction(VERB_LOOK, 0xF3))
 		_vm->_dialogs->show(10605);
-	else if (_action.isAction(VERB_LOOK, 0x109) || _action.isAction(0xD1, 0x109))
+	else if (_action.isAction(VERB_LOOK, 0x109) || _action.isAction(VERB_LOOK_AT, 0x109))
 		_vm->_dialogs->show(10606);
 	else if (_action.isAction(0x109) && (_action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL) || _action.isAction(VERB_TAKE)))
 		_vm->_dialogs->show(10607);
-	else if (_action.isAction(VERB_LOOK, 0x139) || _action.isAction(0xD1, 0x139))
+	else if (_action.isAction(VERB_LOOK, 0x139) || _action.isAction(VERB_LOOK_AT, 0x139))
 		_vm->_dialogs->show(10608);
 	else if (_action.isAction(VERB_LOOK, 0xD9))
 		_vm->_dialogs->show(10609);
@@ -2178,10 +2178,10 @@ void Scene107::step() {
 }
 
 void Scene107::preActions() {
-	if (_action.isAction(0x15D, 0xF6))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0xF6))
 		_game._player._walkOffScreenSceneId = 106;
 
-	if (_action.isAction(0x15D, 0xF5))
+	if (_action.isAction(VERB_SWIM_TOWARDS, 0xF5))
 		_game._player._walkOffScreenSceneId = 108;
 }
 
@@ -2199,7 +2199,7 @@ void Scene107::actions() {
 			_globals[kFishIn107] = false;
 			_vm->_dialogs->showItem(OBJ_DEAD_FISH, 802);
 		}
-	} else if (_action.isAction(0x15D, 0xEE))
+	} else if (_action.isAction(VERB_SWIM_TOWARDS, 0xEE))
 		_scene->_nextSceneId = 105;
 	else if (_action.isAction(VERB_LOOK, 0xEE))
 		_vm->_dialogs->show(10701);
@@ -2273,7 +2273,7 @@ void Scene108::enter() {
 }
 
 void Scene108::preActions() {
-	if (_action.isAction(0x15E, 0xFB))
+	if (_action.isAction(VERB_SWIM_UNDER, 0xFB))
 		_game._player._walkOffScreenSceneId = 109;
 }
 
@@ -2291,7 +2291,7 @@ void Scene108::actions() {
 			_globals[kFishIn108] = false;
 			_vm->_dialogs->showItem(OBJ_DEAD_FISH, 10808);
 		}
-	} else if (_action.isAction(0x15D, 0xF4))
+	} else if (_action.isAction(VERB_SWIM_TOWARDS, 0xF4))
 		_scene->_nextSceneId = 107;
 	else if (_action.isAction(VERB_LOOK, 0x4D))
 		_vm->_dialogs->show(10801);
@@ -2485,7 +2485,7 @@ void Scene109::step() {
 }
 
 void Scene109::preActions() {
-	if (_action.isAction(0x15E, 0xFC))
+	if (_action.isAction(VERB_SWIM_UNDER, 0xFC))
 		_game._player._walkOffScreenSceneId = 108;
 
 	if ((_action.isAction(VERB_THROW) || _action.isAction(VERB_GIVE) || _action.isAction(VERB_PUT))
@@ -2500,7 +2500,7 @@ void Scene109::preActions() {
 		}
 	}
 
-	if ((_action.isAction(0x15A, 0x178) || _action.isAction(0x15C, 0x146))
+	if ((_action.isAction(VERB_SWIM_INTO, 0x178) || _action.isAction(VERB_SWIM_TO, 0x146))
 	&& (!_globals[kHoovicAlive] || _globals[kHoovicSated]) && (_action.isObject(0x178)))
 		_game._player._walkOffScreenSceneId = 110;
 
@@ -2789,7 +2789,7 @@ void Scene110::step() {
 }
 
 void Scene110::preActions() {
-	if (_action.isAction(0x15B, 0x41))
+	if (_action.isAction(VERB_SWIM_THROUGH, 0x41))
 		_game._player._walkOffScreenSceneId = 109;
 
 	if (_crabsFl) {
@@ -2817,7 +2817,7 @@ void Scene110::preActions() {
 }
 
 void Scene110::actions() {
-	if (_action.isAction(0x15B, 0x178)) {
+	if (_action.isAction(VERB_SWIM_THROUGH, 0x178)) {
 		switch (_game._trigger) {
 		case 0:
 			_scene->loadAnimation(Resources::formatName(110, 'T', 0, EXT_AA, ""), 1);
@@ -2833,7 +2833,7 @@ void Scene110::actions() {
 		}
 	} else if ((_action._lookFlag) || _action.isAction(VERB_LOOK, 0x3F))
 		_vm->_dialogs->show(11001);
-	else if (_action.isAction(VERB_LOOK, 0x40) || _action.isAction(0xD1, 0x40))
+	else if (_action.isAction(VERB_LOOK, 0x40) || _action.isAction(VERB_LOOK_AT, 0x40))
 		_vm->_dialogs->show(11002);
 	else if (_action.isAction(VERB_LOOK, 0x129))
 		_vm->_dialogs->show(11003);
@@ -2964,12 +2964,12 @@ void Scene111::step() {
 }
 
 void Scene111::preActions() {
-	if (_action.isAction(0x18B, 0x41))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x41))
 		_game._player._walkOffScreenSceneId = 212;
 }
 
 void Scene111::actions() {
-	if (_action.isAction(0x6D, 0x116) && _game._objects.isInInventory(OBJ_REBREATHER)) {
+	if (_action.isAction(VERB_DIVE_INTO, 0x116) && _game._objects.isInInventory(OBJ_REBREATHER)) {
 		switch (_game._trigger) {
 		case 0:
 			_scene->loadAnimation(Resources::formatName(111, 'A', 1, EXT_AA, ""), 1);
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 47582cd8b6..cfb261c72b 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -712,7 +712,7 @@ void Scene202::preActions() {
 	if (player._readyToWalk)
 		_scene->_kernelMessages.reset();
 
-	if (!_ladderTopFl && (_action.isAction(0x4E, NOUN_LADDER) || !player._readyToWalk)) {
+	if (!_ladderTopFl && (_action.isAction(VERB_CLIMB_DOWN, NOUN_LADDER) || !player._readyToWalk)) {
 		if (_game._trigger == 0) {
 			_vm->_sound->command(29);
 			player._readyToWalk = false;
@@ -930,7 +930,7 @@ void Scene202::actions() {
 				return;
 			}
 		}
-	} else if (_action.isAction(0x188, 0xAA)) {
+	} else if (_action.isAction(VERB_WALK_INSIDE, 0xAA)) {
 		setRandomKernelMessage();
 	} else if (_action.isAction(VERB_LOOK, NOUN_ROCKS)) {
 		_vm->_dialogs->show(20202);
@@ -1342,7 +1342,7 @@ void Scene205::actions() {
 			_scene->_reloadSceneFlag = true;
 		}
 	} else {
-		if (_action.isAction(0x1AD, 0x1C7))
+		if (_action.isAction(VERB_WALK_DOWN, 0x1C7))
 			_scene->_nextSceneId = 210;
 
 		if (_action.isAction(VERB_WALKTO, 0x86) || _action.isAction(VERB_WALKTO, 0x1C2)) {
@@ -4464,7 +4464,7 @@ void Scene210::actions() {
 		_vm->_dialogs->show(21009);
 	} else if (_action.isAction(VERB_LOOK, 0x1DC)) {
 		_vm->_dialogs->show(21010);
-	} else if (_action.isAction(0x13A, 0x1DC) || _action.isAction(0xA6, 0x1DC)) {
+	} else if (_action.isAction(VERB_SHOOT, 0x1DC) || _action.isAction(VERB_HOSE_DOWN, 0x1DC)) {
 		_vm->_dialogs->show(21011);
 	} else if (_action.isAction(VERB_LOOK, 0x1BF)) {
 		_vm->_dialogs->show(21012);
@@ -5086,7 +5086,7 @@ void Scene214::actions() {
 		_vm->_dialogs->show(21415);
 	else if (_action.isAction(VERB_GIVE, 0x17A, 0x1C3))
 		_vm->_dialogs->show(21416);
-	else if (_action.isAction(0x13A, 0x29, 0x1C3) || _action.isAction(0xA6, 0x29, 0x1C3))
+	else if (_action.isAction(VERB_SHOOT, 0x29, 0x1C3) || _action.isAction(VERB_HOSE_DOWN, 0x29, 0x1C3))
 		_vm->_dialogs->show(21417);
 	else if (_action.isAction(VERB_LOOK, 0x473))
 		_vm->_dialogs->show(21418);
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 5337c99cb7..d0dd47759c 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -959,7 +959,7 @@ void Scene307::actions() {
 		default:
 			break;
 		}
-	}else if (_action.isAction(0x2F7, 0x11)) {
+	}else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) {
 		if (_grateOpenedFl) {
 			switch (_game._trigger) {
 			case 0:
@@ -1698,7 +1698,7 @@ void Scene311::actions() {
 		_scene->_kernelMessages.addQuote(0xFA, 120, 0);
 	} else if (_action.isAction(0x21F, 0x1E4))
 		_scene->_nextSceneId = 320;
-	else if (_action.isAction(0x2F7, 0x11)) {
+	else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1794,13 +1794,13 @@ void Scene311::actions() {
 		_vm->_dialogs->show(31110);
 	else if (_action.isAction(VERB_LOOK, 0x18D))
 		_vm->_dialogs->show(31111);
-	else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(0x155, 0x220))
+	else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(VERB_STARE_AT, 0x220))
 		_vm->_dialogs->show(31112);
-	else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(0x155, 0x208))
+	else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(VERB_STARE_AT, 0x208))
 		_vm->_dialogs->show(31113);
 	else if (_action.isAction(VERB_TAKE, 0x208))
 		_vm->_dialogs->show(31114);
-	else if (_action.isAction(VERB_LOOK, 0xCD) || _action.isAction(0x155, 0xCD))
+	else if (_action.isAction(VERB_LOOK, 0xCD) || _action.isAction(VERB_STARE_AT, 0xCD))
 		_vm->_dialogs->show(31115);
 	else if (_action.isAction(VERB_TAKE, 0xCD))
 		_vm->_dialogs->show(31116);
@@ -2249,7 +2249,7 @@ void Scene316::step() {
 }
 
 void Scene316::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9)) {
 		if (_globals[kAfterHavoc])
 			_game._player._walkOffScreenSceneId = 354;
 		else
@@ -2258,7 +2258,7 @@ void Scene316::preActions() {
 }
 
 void Scene316::actions() {
-	if (_action.isAction(0x2F7, 0x11)) {
+	if (_action.isAction(VERB_CLIMB_INTO, 0x11)) {
 		if (_globals[kSexOfRex] == REX_FEMALE)
 			handleRoxInGrate();
 		else
@@ -2740,7 +2740,7 @@ void Scene318::preActions() {
 	if (_game._player._needToWalk)
 		_game._player._needToWalk = _game._player._visible;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 357;
 }
 
@@ -2832,7 +2832,7 @@ void Scene318::actions() {
 	}
 
 	if (_game._player._visible) {
-		if (_action.isAction(0x1AD, 0x2B3)) {
+		if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) {
 			_scene->_nextSceneId = 407;
 			_action._inProgress = false;
 			return;
@@ -3641,7 +3641,7 @@ void Scene320::step() {
 void Scene320::actions() {
 	if (_action._lookFlag)
 		_vm->_dialogs->show(32011);
-	else if ((_action.isAction(0x11A) || _action.isAction(VERB_PUSH)) &&
+	else if ((_action.isAction(VERB_PRESS) || _action.isAction(VERB_PUSH)) &&
 		(_action.isAction(0x2E8) || _action.isAction(0x2E9) || _action.isAction(0x2EA) || _action.isAction(0x2EB) ||
 		 _action.isAction(0x2DE) || _action.isAction(0x2DD) || _action.isAction(0x2E0) || _action.isAction(0x2E1) ||
 		 _action.isAction(0x2E2) || _action.isAction(0x2E3) || _action.isAction(0x2E4) || _action.isAction(0x2E5) ||
@@ -3735,7 +3735,7 @@ void Scene320::actions() {
 		_vm->_dialogs->show(32012);
 	else if (_action.isAction(VERB_TAKE, 0x2F2))
 		_vm->_dialogs->show(32013);
-	else if (_action.isAction(VERB_TAKE, 0x2EE) || _action.isAction(0x75, 0x2EE))
+	else if (_action.isAction(VERB_TAKE, 0x2EE) || _action.isAction(VERB_EAT, 0x2EE))
 		_vm->_dialogs->show(32014);
 	else if (_action.isAction(VERB_TAKE, 0x2F3))
 		_vm->_dialogs->show(32015);
@@ -3838,7 +3838,7 @@ void Scene322::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(0x103, 0x181))
+	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181))
 		_vm->_dialogs->show(32210);
 	else if (_action.isAction(VERB_LOOK, 0xC4))
 		_vm->_dialogs->show(32211);
@@ -3954,9 +3954,9 @@ void Scene351::step() {
 void Scene351::actions() {
 	if (_action._lookFlag)
 		_vm->_dialogs->show(35121);
-	else if (_action.isAction(0x2F9, 0x16C))
+	else if (_action.isAction(VERB_STEP_INTO, 0x16C))
 		_scene->_nextSceneId = 322;
-	else if (_action.isAction(0x1AD, 0x2B3))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2B3))
 		_scene->_nextSceneId = 352;
 	else if (_action.isAction(VERB_TAKE, 0x5C)) {
 		if (_game._trigger || !_game._objects.isInInventory(0xF)) {
@@ -4217,7 +4217,7 @@ void Scene352::preActions() {
 			_game._player.walk(Common::Point(271, 111), FACING_NORTHEAST);
 	}
 
-	if (_action.isAction(0x18B, 0x70) || _action.isAction(0x1AD, 0x2B3) || _action.isAction(VERB_PUT, 0x3B6, 0x89)) {
+	if (_action.isAction(VERB_WALK_THROUGH, 0x70) || _action.isAction(VERB_WALK_DOWN, 0x2B3) || _action.isAction(VERB_PUT, 0x3B6, 0x89)) {
 		if (_game._objects.isInInventory(OBJ_GUARDS_ARM))
 			_game._player.walk(Common::Point(230, 117), FACING_NORTHWEST);
 	}
@@ -4288,15 +4288,15 @@ void Scene352::actions() {
 	bool exit_corridor = false;
 	bool exit_doorway = false;
 
-	if (_action.isAction(0x1AD, 0x2B3)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B3)) {
 		exit_corridor = true;
 	}
 
-	if (_action.isAction(0x18B, 0x70)) {
+	if (_action.isAction(VERB_WALK_THROUGH, 0x70)) {
 		exit_doorway = true;
 	}
 
-	if (_action.isAction(0x1AD, 0x2B3) || _action.isAction(0x18B, 0x70) || _action.isAction(VERB_PUT, 0x3B6, 0x89)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B3) || _action.isAction(VERB_WALK_THROUGH, 0x70) || _action.isAction(VERB_PUT, 0x3B6, 0x89)) {
 		if (_mustPutArmDownFl)
 			putArmDown(exit_corridor, exit_doorway);
 		else if (exit_corridor)
@@ -4598,9 +4598,9 @@ void Scene353::enter() {
 void Scene353::actions() {
 	if (_action._lookFlag)
 		_vm->_dialogs->show(35315);
-	else if (_action.isAction(0x18B, 0x70))
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x70))
 		_scene->_nextSceneId = 352;
-	else if (_action.isAction(0x1AD, 0x2B3))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2B3))
 		_scene->_nextSceneId = 354;
 	else if (_action.isAction(VERB_LOOK, 0x23D))
 		_vm->_dialogs->show(35310);
@@ -4649,21 +4649,21 @@ void Scene354::enter() {
 }
 
 void Scene354::preActions() {
-	if (_action.isAction(0x1AD, 0x2B3))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B3))
 		_game._player._walkOffScreenSceneId = 401;
 }
 
 void Scene354::actions() {
 	if (_action._lookFlag)
 		_vm->_dialogs->show(35414);
-	else if (_action.isAction(0x1AD, 0x2B4)) {
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) {
 		_game._player.startWalking(Common::Point(208, 0), FACING_NORTHEAST);
 		_game._player._walkOffScreenSceneId = 353;
-	} else if (_action.isAction(0x1AD, 0x2B9))
+	} else if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_scene->_nextSceneId = 361;
-	else if (_action.isAction(0x1AD, 0x2BA))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_scene->_nextSceneId = 316;
-	else if (_action.isAction(0x1AD, 0x2B3))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2B3))
 		_scene->_nextSceneId = 401;
 	else if (_action.isAction(VERB_LOOK, 0x2C6))
 		_vm->_dialogs->show(35410);
@@ -4716,10 +4716,10 @@ void Scene357::enter() {
 }
 
 void Scene357::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 318;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 358;
 }
 
@@ -4728,7 +4728,7 @@ void Scene357::actions() {
 		_vm->_dialogs->show(35715);
 	else if (_action.isAction(VERB_LOOK, 0x11))
 		_vm->_dialogs->show(35710);
-	else if (_action.isAction(0x2F7, 0x11))
+	else if (_action.isAction(VERB_CLIMB_INTO, 0x11))
 		_vm->_dialogs->show(35711);
 	else if (_action.isAction(VERB_LOOK, 0x1CB))
 		_vm->_dialogs->show(35712);
@@ -4780,10 +4780,10 @@ void Scene358::enter() {
 }
 
 void Scene358::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 357;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 359;
 }
 
@@ -4846,10 +4846,10 @@ void Scene359::enter() {
 }
 
 void Scene359::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 358;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 360;
 }
 
@@ -4976,10 +4976,10 @@ void Scene360::enter() {
 }
 
 void Scene360::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 359;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 361;
 }
 
@@ -5348,10 +5348,10 @@ void Scene361::step() {
 }
 
 void Scene361::preActions() {
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 360;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 354;
 }
 
@@ -5361,7 +5361,7 @@ void Scene361::actions() {
 	else if (_action.isAction(0x21F, 0x1E4)) {
 		_scene->_kernelMessages.reset();
 		_scene->_kernelMessages.addQuote(0xFC, 120, 0);
-	} else if (_action.isAction(0x2F7, 0x11)) {
+	} else if (_action.isAction(VERB_CLIMB_INTO, 0x11)) {
 		if (_globals[kSexOfRex] == REX_FEMALE)
 			handleRoxAction();
 		else
@@ -5370,13 +5370,13 @@ void Scene361::actions() {
 		_vm->_dialogs->show(36110);
 	else if (_action.isAction(VERB_LOOK, 0x18D))
 		_vm->_dialogs->show(36111);
-	else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(0x155, 0x220))
+	else if (_action.isAction(VERB_LOOK, 0x220) || _action.isAction(VERB_STARE_AT, 0x220))
 		_vm->_dialogs->show(36112);
-	else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(0x155, 0x208))
+	else if (_action.isAction(VERB_LOOK, 0x208) || _action.isAction(VERB_STARE_AT, 0x208))
 		_vm->_dialogs->show(36113);
 	else if (_action.isAction(VERB_TAKE, 0x208))
 		_vm->_dialogs->show(36114);
-	else if (_action.isAction(VERB_LOOK, 0x2F8) || _action.isAction(0x155, 0x2F8))
+	else if (_action.isAction(VERB_LOOK, 0x2F8) || _action.isAction(VERB_STARE_AT, 0x2F8))
 		_vm->_dialogs->show(36115);
 	else if (_action.isAction(VERB_TAKE, 0x2F8))
 		_vm->_dialogs->show(36116);
@@ -5414,7 +5414,7 @@ void Scene366::actions() {
 		else
 			_vm->_dialogs->show(36613);
 		_scene->_nextSceneId = 316;
-	} else if (_action.isAction(0xD3, 0x2D3)) {
+	} else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) {
 		if (_game._visitedScenes.exists(321))
 			_vm->_dialogs->show(36611);
 		else
@@ -5443,7 +5443,7 @@ void Scene387::enter() {
 void Scene387::actions() {
 	if (_action.isAction(0x2D5, 0x2D4))
 		_scene->_nextSceneId = 313;
-	else if (_action.isAction(0xD3, 0x2D3))
+	else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3))
 		_vm->_dialogs->show(38710);
 	else if (_action.isAction(VERB_OPEN, 0x2D3))
 		_vm->_dialogs->show(38711);
@@ -5503,7 +5503,7 @@ void Scene388::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0xD3, 0x2D3)) {
+	} else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) {
 		if (_globals[kAfterHavoc])
 			_vm->_dialogs->show(38811);
 		else
@@ -5576,7 +5576,7 @@ void Scene389::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0xD3, 0x2D3)) {
+	} else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) {
 		if (_globals[kAfterHavoc]) {
 			if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359))
 				_vm->_dialogs->show(38911);
@@ -5619,7 +5619,7 @@ void Scene390::enter() {
 void Scene390::actions() {
 	if (_action.isAction(0x2D5, 0x2D4))
 		_scene->_nextSceneId = 313;
-	else if (_action.isAction(0xD3, 0x2D3))
+	else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3))
 		_vm->_dialogs->show(39010);
 	else if (_action.isAction(VERB_OPEN, 0x2D3))
 		_vm->_dialogs->show(39011);
@@ -5657,7 +5657,7 @@ void Scene391::actions() {
 			_scene->_nextSceneId = 361;
 		else
 			_scene->_nextSceneId = 311;
-	} else if (_action.isAction(0xD3, 0x2D3)) {
+	} else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) {
 		if (_globals[kAfterHavoc])
 			_vm->_dialogs->show(39111);
 		else
@@ -5684,7 +5684,7 @@ void Scene399::enter() {
 void Scene399::actions() {
 	if (_action.isAction(0x2D5, 0x2D4))
 		_scene->_nextSceneId = 313;
-	else if (_action.isAction(0xD3, 0x2D3)) {
+	else if (_action.isAction(VERB_LOOK_THROUGH, 0x2D3)) {
 		if (_globals[kAfterHavoc]) {
 			if ((_game._difficulty != DIFFICULTY_HARD) && (_game._objects[OBJ_SECURITY_CARD]._roomNumber == 359))
 				_vm->_dialogs->show(38911);
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 79352fbb00..2053c47cf1 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -158,12 +158,12 @@ void Scene401::step() {
 }
 
 void Scene401::preActions() {
-	if (_action.isAction(0x1AD, 0x2B4)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) {
 		_game._player.walk(Common::Point(149, 89), FACING_NORTH);
 		_northFl = false;
 	}
 
-	if (_action.isAction(0x1AD, 0x2B3) && !_northFl)
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B3) && !_northFl)
 		_game._player._walkOffScreenSceneId = 405;
 
 	if (_action.isAction(VERB_TAKE))
@@ -207,7 +207,7 @@ void Scene401::actions() {
 	if (_action.isAction(0x242, 0x241)) {
 		if (!_northFl)
 			_scene->_nextSceneId = 402;
-	} else if (_action.isAction(0x1AD, 0x2B4))
+	} else if (_action.isAction(VERB_WALK_DOWN, 0x2B4))
 		_scene->_nextSceneId = 354;
 	else if (_action.isAction(VERB_LOOK, 0x1F3)) {
 		if (_globals[kHasBeenScanned])
@@ -1977,7 +1977,7 @@ void Scene402::step() {
 }
 
 void Scene402::preActions() {
-	if (_action.isAction(0x30B, 0x24A) && (_game._player._prepareWalkPos.x != 248))
+	if (_action.isAction(VERB_SIT_ON, 0x24A) && (_game._player._prepareWalkPos.x != 248))
 		_game._player.walk(Common::Point(232, 112), FACING_EAST);
 
 	if (_action.isAction(VERB_WALKTO, 0x309))
@@ -2144,10 +2144,10 @@ void Scene402::actions() {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_sequences.addTimer(120, 44);
 		_game._player._stepEnabled = false;
-	} else if (_action.isAction(0x30B, 0x24A) && (_game._player._targetPos.x == 248)){
+	} else if (_action.isAction(VERB_WALK_ALONG, 0x24A) && (_game._player._targetPos.x == 248)){
 		_scene->_kernelMessages.add(Common::Point(0, -14), 0x1110, 34, 0, 120, _game.getQuote(0x20D));
 		_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 120, _game.getQuote(0x20E));
-	} else if (_action.isAction(0x30B, 0x24A) && !_roxOnStool && (_game._player._targetPos.x != 248)) {
+	} else if (_action.isAction(VERB_WALK_ALONG, 0x24A) && !_roxOnStool && (_game._player._targetPos.x != 248)) {
 		_game._player._visible = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_globals._sequenceIndexes[6] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[6], false, 7, 1, 0, 0);
@@ -2435,10 +2435,10 @@ void Scene405::preActions() {
 	if (_action.isAction(VERB_TAKE))
 		_game._player._needToWalk = false;
 
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 401;
 
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 406;
 
 	if (_action.isAction(VERB_CLOSE, 0x259) && _globals[kArmoryDoorOpen])
@@ -2446,11 +2446,11 @@ void Scene405::preActions() {
 }
 
 void Scene405::actions() {
-	if (_action.isAction(0x18B, 0x6E))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x6E))
 		_scene->_nextSceneId = 413;
-	else if (_action.isAction(0x18B, 0x259) && _globals[kArmoryDoorOpen])
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x259) && _globals[kArmoryDoorOpen])
 		_scene->_nextSceneId = 408;
-	else if (_action.isAction(0x18B, 0x259) && !_globals[kArmoryDoorOpen])
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x259) && !_globals[kArmoryDoorOpen])
 		_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0x24F));
 	else if (_action.isAction(VERB_PUT, 0x131, 0x251) && !_globals[kArmoryDoorOpen]) {
 		_game._player._stepEnabled = false;
@@ -2621,10 +2621,10 @@ void Scene406::step() {
 }
 
 void Scene406::preActions() {
-	if (_action.isAction(0x1AD, 0x2BA))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2BA))
 		_game._player._walkOffScreenSceneId = 405;
 
-	if (_action.isAction(0x1AD, 0x2B9))
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B9))
 		_game._player._walkOffScreenSceneId = 407;
 
 	if (_action.isAction(VERB_TAKE))
@@ -2635,16 +2635,16 @@ void Scene406::preActions() {
 }
 
 void Scene406::actions() {
-	if (_action.isAction(0x18B, 0x6E) && (_game._player._targetPos.x> 100)) {
+	if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && (_game._player._targetPos.x> 100)) {
 		_game._player._stepEnabled = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_scene->_sequences.remove(_globals._sequenceIndexes[3]);
 		_globals._sequenceIndexes[3] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[3], false, 3, 1, 0, 0);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[3], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
 		_vm->_sound->command(19);
-	} else if (_action.isAction(0x18B, 0x6E) && _globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100))
+	} else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && _globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100))
 		_scene->_nextSceneId = 410;
-	else if (_action.isAction(0x18B, 0x6E) && !_globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) {
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && !_globals[kStorageDoorOpen] && (_game._player._targetPos.x < 100)) {
 		_scene->_kernelMessages.add(Common::Point(0, 0), 0x1110, 34, 0, 60, _game.getQuote(0x24F));
 		if (!_hitStorageDoor) {
 			_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -2774,7 +2774,7 @@ void Scene407::preActions() {
 	if (_action.isAction(VERB_LOOK, 0x6E))
 		_game._player._needToWalk = true;
 
-	if (_action.isAction(0x1AD, 0x2B4)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B4)) {
 		_game._player.walk(Common::Point(172, 91), FACING_NORTH);
 		_fromNorth = false;
 	}
@@ -2813,9 +2813,9 @@ void Scene407::actions() {
 		}
 	}
 
-	if (_action.isAction(0x1AD, 0x2B3) && !_fromNorth)
+	if (_action.isAction(VERB_WALK_DOWN, 0x2B3) && !_fromNorth)
 		_scene->_nextSceneId = 406;
-	else if (_action.isAction(0x1AD, 0x2B4))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x2B4))
 		_scene->_nextSceneId = 318;
 	else if (_action.isAction(VERB_LOOK, 0x1F3)) {
 		if (_globals[kHasBeenScanned])
@@ -3030,11 +3030,11 @@ void Scene409::actions() {
 
 	if (_action.isAction(VERB_LOOK, 0x181))
 		_vm->_dialogs->show(40910);
-	else if (_action.isAction(0x103, 0x181))
+	else if (_action.isAction(VERB_PEER_THROUGH, 0x181))
 		_vm->_dialogs->show(40910);
 	else if (_action.isAction(VERB_LOOK, 0xC4))
 		_vm->_dialogs->show(40911);
-	else if (_action.isAction(0xB7, 0xC4))
+	else if (_action.isAction(VERB_INSPECT, 0xC4))
 		_vm->_dialogs->show(40911);
 	else if (_action.isAction(VERB_LOOK, 0x1CC))
 		_vm->_dialogs->show(40912);
@@ -4086,11 +4086,11 @@ void Scene413::preActions() {
 }
 
 void Scene413::actions() {
-	if (_action.isAction(0x188, 0x16C)) {
+	if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_scene->_nextSceneId = 409;
-	} else if (_action.isAction(0x188, 0x2B3))
+	} else if (_action.isAction(VERB_WALK_INSIDE, 0x2B3))
 		_scene->_nextSceneId = 405;
 	else if (_action.isAction(VERB_LOOK, 0x2C4))
 		_vm->_dialogs->show(41310);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index c884170946..44363ec2ae 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -274,7 +274,7 @@ void Scene501::step() {
 }
 
 void Scene501::preActions() {
-	if (_action.isAction(0x1AD) && (_action.isAction(0x321) || _action.isAction(0x322)))
+	if (_action.isAction(VERB_WALK_DOWN) && (_action.isAction(0x321) || _action.isAction(0x322)))
 		_game._player._walkOffScreenSceneId = 551;
 }
 
@@ -430,7 +430,7 @@ void Scene501::actions() {
 	else if (_action.isAction(VERB_LOOK, 0x322))
 		_vm->_dialogs->show(50118);
 	else if (_action.isAction(VERB_LOOK, 0x361) || _action.isAction(VERB_LOOK, 0x360)
-		|| _action.isAction(0x1AD, 0x361) || _action.isAction(0x1AD, 0x360))
+		|| _action.isAction(VERB_WALK_DOWN, 0x361) || _action.isAction(VERB_WALK_DOWN, 0x360))
 		_vm->_dialogs->show(50119);
 	else if (_action.isAction(VERB_LOOK, 0x323))
 		_vm->_dialogs->show(50120);
@@ -490,7 +490,7 @@ void Scene502::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(0x103, 0x181))
+	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181))
 		_vm->_dialogs->show(50210);
 	else if (_action.isAction(VERB_LOOK, 0xC4))
 		_vm->_dialogs->show(50211);
@@ -742,7 +742,7 @@ void Scene504::preActions() {
 }
 
 void Scene504::actions() {
-	if (_action.isAction(0x1CE, 0x324)) {
+	if (_action.isAction(VERB_EXIT_FROM, 0x324)) {
 		_vm->_sound->command(15);
 		_scene->_nextSceneId = _globals[kHoverCarLocation];
 	} else if (_action.isAction(0xE, 0x380)) {
@@ -815,7 +815,7 @@ void Scene504::actions() {
 		_vm->_dialogs->show(50414);
 	else if (_action.isAction(VERB_LOOK, 0x382))
 		_vm->_dialogs->show(50415);
-	else if (_action.isAction(VERB_LOOK, 0x386) || _action.isAction(0xD3, 0x386))
+	else if (_action.isAction(VERB_LOOK, 0x386) || _action.isAction(VERB_LOOK_THROUGH, 0x386))
 		_vm->_dialogs->show(50416);
 	else if (_action.isAction(VERB_LOOK, 0x120))
 		_vm->_dialogs->show(50417);
@@ -1071,7 +1071,7 @@ void Scene505::step() {
 }
 
 void Scene505::actions() {
-	if (_action.isAction(0x11A))
+	if (_action.isAction(VERB_PRESS))
 		_nextButtonId = _action._activeAction._objectNameId;
 	else if (_action.isAction(0x2D5, 0x38C))
 		_scene->_nextSceneId = 504;
@@ -1333,7 +1333,7 @@ void Scene506::actions() {
 		_vm->_dialogs->show(50615);
 	else if (_action.isAction(VERB_LOOK, 0x37D))
 		_vm->_dialogs->show(50616);
-	else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(0x1AD, 0x360))
+	else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(VERB_WALK_DOWN, 0x360))
 		_vm->_dialogs->show(50617);
 	else if (_action.isAction(VERB_LOOK, 0x373))
 		_vm->_dialogs->show(50619);
@@ -1374,7 +1374,7 @@ void Scene507::enter() {
 	sceneEntrySound();
 }
 void Scene507::actions() {
-	if (_action.isAction(0x18B, 0x378))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x378))
 		_scene->_nextSceneId = 506;
 	else if (_action.isAction(VERB_TAKE, 0x106)) {
 		if (_game._trigger || !_game._objects.isInInventory(OBJ_PENLIGHT)) {
@@ -1996,7 +1996,7 @@ void Scene511::actions() {
 		_vm->_dialogs->show(51113);
 	else if (_action.isAction(VERB_LOOK, 0x31D))
 		_vm->_dialogs->show(51114);
-	else if (_action.isAction(0x1AD, 0x322) || _action.isAction(0x1AD, 0x361) || _action.isAction(0x1AD, 0x321))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x322) || _action.isAction(VERB_WALK_DOWN, 0x361) || _action.isAction(VERB_WALK_DOWN, 0x321))
 		_vm->_dialogs->show(51115);
 	else if (_action.isAction(VERB_LOOK, 0x37B))
 		_vm->_dialogs->show(51116);
@@ -2286,7 +2286,7 @@ void Scene512::actions() {
 		_vm->_dialogs->show(51218);
 	else if (_action.isAction(VERB_TAKE, 0x354))
 		_vm->_dialogs->show(51219);
-	else if (_action.isAction(VERB_LOOK, 0x349) || _action.isAction(0x103, 0x349))
+	else if (_action.isAction(VERB_LOOK, 0x349) || _action.isAction(VERB_PEER_THROUGH, 0x349))
 		_vm->_dialogs->show(51220);
 	else if (_action.isAction(VERB_LOOK, 0x160))
 		_vm->_dialogs->show(51221);
@@ -2539,7 +2539,7 @@ void Scene513::actions() {
 		_vm->_dialogs->show(51315);
 	else if (_action.isAction(VERB_LOOK, 0x244))
 		_vm->_dialogs->show(51316);
-	else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(0x1AD, 0x360))
+	else if (_action.isAction(VERB_LOOK, 0x360) || _action.isAction(VERB_WALK_DOWN, 0x360))
 		_vm->_dialogs->show(51317);
 	else if (_action.isAction(VERB_OPEN, 0x367) || _action.isAction(VERB_OPEN, 0x317))
 		_vm->_dialogs->show(51319);
@@ -2681,12 +2681,12 @@ void Scene551::step() {
 }
 
 void Scene551::preActions() {
-	if (_action.isAction(0x1AD) && (_action.isAction(0x360) || _action.isAction(0x361)))
+	if (_action.isAction(VERB_WALK_DOWN) && (_action.isAction(0x360) || _action.isAction(0x361)))
 		_game._player._walkOffScreenSceneId = 501;
 }
 
 void Scene551::actions() {
-	if (_action.isAction(0x2F9, 0x16C))
+	if (_action.isAction(VERB_STEP_INTO, 0x16C))
 		_scene->_nextSceneId = 502;
 	else if ((_action._lookFlag))
 		_vm->_dialogs->show(55117);
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 4cacfacbc8..0921cebe50 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -147,7 +147,7 @@ void Scene601::step() {
 }
 
 void Scene601::actions() {
-	if (_action.isAction(0x18B, 0x378))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x378))
 		_scene->_nextSceneId = 602;
 	else if (_action.isAction(0x325, 0x324)) {
 		switch (_game._trigger) {
@@ -197,7 +197,7 @@ void Scene601::actions() {
 		_vm->_dialogs->show(60113);
 	else if (_action.isAction(VERB_LOOK, 0x323))
 		_vm->_dialogs->show(60114);
-	else if (_action.isAction(0x1AD, 0x31E))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x31E))
 		_vm->_dialogs->show(60115);
 	else if (_action.isAction(VERB_LOOK, 0x48E))
 		_vm->_dialogs->show(60116);
@@ -383,9 +383,9 @@ void Scene602::handleSafeActions() {
 }
 
 void Scene602::actions() {
-	if (_action.isAction(0x18B, 0x1F9))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x1F9))
 		_scene->_nextSceneId = 601;
-	else if (_action.isAction(0x18B, 0x70))
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x70))
 		_scene->_nextSceneId = 603;
 	else if (_action.isAction(VERB_OPEN, 0x3D3) && ((_globals[kSafeStatus] == 0) || (_globals[kSafeStatus] == 2))) {
 		_safeMode = 1;
@@ -564,7 +564,7 @@ void Scene603::enter() {
 }
 
 void Scene603::actions() {
-	if (_action.isAction(0x18C, 0x3F1))
+	if (_action.isAction(VERB_WALK_TOWARDS, 0x3F1))
 		_scene->_nextSceneId = 602;
 	else if (_action.isAction(VERB_TAKE, 0x57)) {
 		if ( _game._trigger || !_game._objects.isInInventory(OBJ_COMPACT_CASE)) {
@@ -1296,7 +1296,7 @@ void Scene607::preActions() {
 	if (_action.isAction(VERB_TALKTO, 0x471))
 		_game._player._needToWalk = false;
 
-	if (_action.isAction(0x18B, 0x478) && (_globals[kDogStatus] == 2) && (_game._difficulty != DIFFICULTY_EASY)) {
+	if (_action.isAction(VERB_WALK_THROUGH, 0x478) && (_globals[kDogStatus] == 2) && (_game._difficulty != DIFFICULTY_EASY)) {
 		_shopAvailable = true;
 		_dogTimer = 0;
 	}
@@ -1309,7 +1309,7 @@ void Scene607::preActions() {
 }
 
 void Scene607::actions() {
-	if (_action.isAction(0x18B, 0x478))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x478))
 		_scene->_nextSceneId = 608;
 	else if (_action.isAction(0x325, 0x324)) {
 		switch (_game._trigger) {
@@ -1406,7 +1406,7 @@ void Scene607::actions() {
 		_vm->_dialogs->show(60727);
 	else if (_action.isAction(VERB_LOOK, 0x31F))
 		_vm->_dialogs->show(60728);
-	else if (_action.isAction(0x1AD, 0x31E))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x31E))
 		_vm->_dialogs->show(60730);
 	else if (_action.isAction(0x3FF) && (_action.isAction(VERB_OPEN) || _action.isAction(VERB_PUSH) || _action.isAction(VERB_PULL)))
 		_vm->_dialogs->show(60731);
@@ -2091,7 +2091,7 @@ void Scene608::preActions() {
 }
 
 void Scene608::actions() {
-	if (_action.isAction(0x18B, 0x70))
+	if (_action.isAction(VERB_WALK_THROUGH, 0x70))
 		_scene->_nextSceneId = 607;
 	else if (_action.isAction(VERB_PUSH, 0x403)) {
 		_game._player._stepEnabled = true;
@@ -2586,9 +2586,9 @@ void Scene609::preActions() {
 }
 
 void Scene609::actions() {
-	if (_action.isAction(0x18C, 0x423))
+	if (_action.isAction(VERB_WALK_TOWARDS, 0x423))
 		_scene->_nextSceneId = 611;
-	else if (_action.isAction(0x18B, 0x425)) {
+	else if (_action.isAction(VERB_WALK_THROUGH, 0x425)) {
 		if (!_globals[kBeenInVideoStore]) {
 			switch (_game._trigger) {
 			case 0:
@@ -2691,7 +2691,7 @@ void Scene609::actions() {
 			_vm->_dialogs->show(60918);
 		else
 			_vm->_dialogs->show(60919);
-	} else if (_action.isAction(0x1AD, 0x31E))
+	} else if (_action.isAction(VERB_WALK_DOWN, 0x31E))
 		_vm->_dialogs->show(60730);
 	else
 		return;
@@ -2763,7 +2763,7 @@ void Scene610::step() {
 }
 
 void Scene610::actions() {
-	if (_action.isAction(0x1CE, 0x427))
+	if (_action.isAction(VERB_EXIT_FROM, 0x427))
 		_scene->_nextSceneId = 609;
 	else if (_action.isAction(VERB_TAKE, 0x108)) {
 		if ( _game._trigger || !_game._objects.isInInventory(OBJ_PHONE_HANDSET)) {
@@ -4130,7 +4130,7 @@ void Scene611::step() {
 }
 
 void Scene611::preActions() {
-	if (_action.isAction(0x1AD, 0x423))
+	if (_action.isAction(VERB_WALK_DOWN, 0x423))
 		_game._player._walkOffScreenSceneId = 609;
 
 	if (_resetBatterieText)
@@ -4458,7 +4458,7 @@ void Scene612::actions() {
 		_vm->_dialogs->show(61223);
 	else if (_action.isAction(VERB_LOOK, 0x257))
 		_vm->_dialogs->show(61224);
-	else if (_action.isAction(0x1AD, 0x461) || _action.isAction(0x1AD, 0x463))
+	else if (_action.isAction(VERB_WALK_DOWN, 0x461) || _action.isAction(VERB_WALK_DOWN, 0x463))
 		_vm->_dialogs->show(61225);
 	else
 		return;
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index 85c79e4877..07230ea33a 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -1850,7 +1850,7 @@ void Scene706::preActions() {
 }
 
 void Scene706::actions() {
-	if (_action.isAction(0x188, 0x16C)) {
+	if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_scene->_nextSceneId = 707;
@@ -1858,7 +1858,7 @@ void Scene706::actions() {
 		return;
 	}
 
-	if (_action.isAction(0x298, 0x2FA)) {
+	if (_action.isAction(VERB_EXIT, 0x2FA)) {
 		_scene->_nextSceneId = 705;
 		_action._inProgress = false;
 		return;
@@ -1970,7 +1970,7 @@ void Scene707::actions() {
 		return;
 	}
 
-	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(0x103, 0x181))
+	if (_action.isAction(VERB_LOOK, 0x181) || _action.isAction(VERB_PEER_THROUGH, 0x181))
 		_vm->_dialogs->show(70710);
 	else if (_action.isAction(VERB_LOOK, 0xC4))
 		_vm->_dialogs->show(70711);
@@ -2256,7 +2256,7 @@ void Scene751::preActions() {
 }
 
 void Scene751::actions() {
-	if (_action.isAction(0x312, 0x22C))
+	if (_action.isAction(VERB_WALK_ALONG, 0x22C))
 		; // Nothing
 	else if (_action.isAction(VERB_LOOK, 0x27, 0x470)) {
 		switch (_game._trigger) {
@@ -2284,7 +2284,7 @@ void Scene751::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x2F9, 0x317)) {
+	} else if (_action.isAction(VERB_STEP_INTO, 0x317)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index fee39a776e..6ecde8ae3d 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -249,7 +249,7 @@ void Scene801::preActions() {
 		_game._player._readyToWalk = true;
 	}
 
-	if (_action.isAction(0x188, 0x16C) && _globals[kBeamIsUp]) {
+	if (_action.isAction(VERB_WALK_INSIDE, 0x16C) && _globals[kBeamIsUp]) {
 		_globals[kCutX] = _game._player._playerPos.x;
 		_globals[kCutY] = _game._player._playerPos.y;
 		_globals[kCutFacing] = _game._player._facing;
@@ -262,11 +262,11 @@ void Scene801::preActions() {
 void Scene801::actions() {
 	if (_action.isAction(VERB_LOOK, 0x59))
 		_scene->_nextSceneId = 808;
-	else if (_action.isAction(0x188, 0x16C)) {
+	else if (_action.isAction(VERB_WALK_INSIDE, 0x16C)) {
 		_game._player._stepEnabled = false;
 		_game._player._visible = false;
 		_scene->_nextSceneId = 807;
-	} else if (_action.isAction(0x18B, 0x6E) && (_game._player._playerPos == Common::Point(270, 118))) {
+	} else if (_action.isAction(VERB_WALK_THROUGH, 0x6E) && (_game._player._playerPos == Common::Point(270, 118))) {
 		_game._player._stepEnabled = false;
 		_game._player._facing = FACING_EAST;
 		_game._player.selectSeries();
@@ -391,10 +391,10 @@ void Scene802::step() {
 }
 
 void Scene802::preActions() {
-	if (_action.isAction(0x18C, 0x393))
+	if (_action.isAction(VERB_WALK_TOWARDS, 0x393))
 		_game._player._walkOffScreenSceneId = 801;
 
-	if (_action.isAction(0x1AD, 0x1C1)) {
+	if (_action.isAction(VERB_WALK_DOWN, 0x1C1)) {
 		_game._player._walkOffScreenSceneId = 803;
 		_globals[kForceBeamDown] = false;
 	}
@@ -731,7 +731,7 @@ void Scene803::step() {
 }
 
 void Scene803::preActions() {
-	if (_action.isAction(0x1AD, 0x1AE))
+	if (_action.isAction(VERB_WALK_DOWN, 0x1AE))
 		_game._player._walkOffScreenSceneId = 802;
 
 	if (_action.isAction(VERB_TAKE, 0x139))
@@ -783,7 +783,7 @@ void Scene803::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x3B8, 0x139)) {
+	} else if (_action.isAction(VERB_ENTER, 0x139)) {
 		_vm->_sound->command(17);
 		_game._player._stepEnabled = false;
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
@@ -1132,39 +1132,39 @@ void Scene805::preActions() {
 }
 
 void Scene805::actions() {
-	if (_action.isAction(0x298, 0x398))
+	if (_action.isAction(VERB_EXIT, 0x398))
 		_scene->_nextSceneId = 804;
-	else if (_action.isAction(0x474, 0x137) && _game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) {
+	else if (_action.isAction(VERB_INSTALL, 0x137) && _game._objects.isInInventory(OBJ_SHIELD_MODULATOR)) {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_globals._sequenceIndexes[1] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 70);
 		_game._player._stepEnabled = false;
-	} else if (_action.isAction(0x474, 0x167) && _game._objects.isInInventory(OBJ_TARGET_MODULE)) {
+	} else if (_action.isAction(VERB_INSTALL, 0x167) && _game._objects.isInInventory(OBJ_TARGET_MODULE)) {
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_globals._sequenceIndexes[2] = _scene->_sequences.addSpriteCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 80);
 		_game._player._stepEnabled = false;
-	} else if (_action.isAction(0x476, 0x137) && _globals[kShieldModInstalled]) {
+	} else if (_action.isAction(VERB_REMOVE, 0x137) && _globals[kShieldModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[1]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_globals._sequenceIndexes[1] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[1], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[1], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[1], SEQUENCE_TRIGGER_EXPIRE, 0, 71);
 		_game._player._stepEnabled = false;
-	} else if (_action.isAction(0x476, 0x167) && _globals[kTargetModInstalled]) {
+	} else if (_action.isAction(VERB_REMOVE, 0x167) && _globals[kTargetModInstalled]) {
 		_scene->_sequences.remove(_globals._sequenceIndexes[2]);
 		_game._triggerSetupMode = SEQUENCE_TRIGGER_DAEMON;
 		_globals._sequenceIndexes[2] = _scene->_sequences.startReverseCycle(_globals._spriteIndexes[2], false, 7, 1, 0, 0);
 		_scene->_sequences.setAnimRange(_globals._sequenceIndexes[2], -1, -2);
 		_scene->_sequences.addSubEntry(_globals._sequenceIndexes[2], SEQUENCE_TRIGGER_EXPIRE, 0, 81);
 		_game._player._stepEnabled = false;
-	} else if (_action.isAction(0x474, 0x137) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR))
+	} else if (_action.isAction(VERB_INSTALL, 0x137) && !_game._objects.isInInventory(OBJ_SHIELD_MODULATOR))
 		_vm->_dialogs->show(80511);
-	else if (_action.isAction(0x474, 0x167) && !_game._objects.isInInventory(OBJ_TARGET_MODULE))
+	else if (_action.isAction(VERB_INSTALL, 0x167) && !_game._objects.isInInventory(OBJ_TARGET_MODULE))
 		_vm->_dialogs->show(80510);
-	else if (_action.isAction(0x476, 0x475))
+	else if (_action.isAction(VERB_REMOVE, 0x475))
 		_vm->_dialogs->show(80512);
 	else
 		return;
@@ -1207,9 +1207,9 @@ void Scene807::actions() {
 
 	if (_action.isAction(VERB_LOOK, 0x181))
 		_vm->_dialogs->show(80710);
-	else if (_action.isAction(0x103, 0x181))
+	else if (_action.isAction(VERB_PEER_THROUGH, 0x181))
 		_vm->_dialogs->show(80710);
-	else if (_action.isAction(VERB_LOOK, 0xC4) && _action.isAction(0xB7, 0xC4))
+	else if (_action.isAction(VERB_LOOK, 0xC4) && _action.isAction(VERB_INSPECT, 0xC4))
 		_vm->_dialogs->show(80711);
 	else if (_action.isAction(VERB_LOOK, 0x1CC))
 		_vm->_dialogs->show(80712);
@@ -1277,7 +1277,7 @@ void Scene808::enter() {
 }
 
 void Scene808::actions() {
-	if (_action.isAction(0x11A, 0x3BC)) {
+	if (_action.isAction(VERB_PRESS, 0x3BC)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1313,7 +1313,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x11A, 0x3BE)) {
+	} else if (_action.isAction(VERB_PRESS, 0x3BE)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1343,7 +1343,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x11A, 0x3BD)) {
+	} else if (_action.isAction(VERB_PRESS, 0x3BD)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1374,7 +1374,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x11A, 0x3BF)) {
+	} else if (_action.isAction(VERB_PRESS, 0x3BF)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1391,7 +1391,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x11A, 0x3BB)) {
+	} else if (_action.isAction(VERB_PRESS, 0x3BB)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1408,7 +1408,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x11A, 0x3BA)) {
+	} else if (_action.isAction(VERB_PRESS, 0x3BA)) {
 		switch (_game._trigger) {
 		case 0:
 			_game._player._stepEnabled = false;
@@ -1425,7 +1425,7 @@ void Scene808::actions() {
 		default:
 			break;
 		}
-	} else if (_action.isAction(0x298, 0x1E0)) {
+	} else if (_action.isAction(VERB_EXIT, 0x1E0)) {
 		_scene->_nextSceneId = 801;
 		_globals[kBetweenRooms] = true;
 	} else