MADS: Rename several nouns to verbs

8 files changed, 150 insertions, 144 deletions

diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h
index d97fa4b284..ec06a1bf59 100644
--- a/engines/mads/nebular/nebular_scenes.h
+++ b/engines/mads/nebular/nebular_scenes.h
@@ -40,11 +40,17 @@ enum {
 
 enum Verb {
 	VERB_ACTIVATE       = 0x00E,
+	VERB_ATTACH         = 0x019,
+	VERB_BREAK          = 0x032,
+	VERB_BREATHE_AIR    = 0x033,
 	VERB_CAST           = 0x03D,
 	VERB_CLIMB_DOWN     = 0x04E,
 	VERB_CLIMB_THROUGH  = 0x04F,
 	VERB_CLIMB_UP       = 0x050,
+	VERB_CUT            = 0x061,
+	VERB_DAMPEN         = 0x064,
 	VERB_DIVE_INTO      = 0x06D,
+	NOUN_DRINK          = 0x072,
 	VERB_EAT            = 0x075,
 	VERB_EXAMINE        = 0x07D,
 	VERB_HOSE_DOWN      = 0x0A6,
@@ -98,21 +104,21 @@ enum Verb {
 };
 
 enum Noun {
-	NOUN_GAME = 0x1,
-	NOUN_QSAVE = 0x2,
-	NOUN_LOOK = 0x3,
-	NOUN_TAKE = 0x4,
-	NOUN_PUSH = 0x5,
-	NOUN_OPEN = 0x6,
-	NOUN_PUT = 0x7,
-	NOUN_TALK_TO = 0x8,
-	NOUN_GIVE = 0x9,
-	NOUN_PULL = 0xA,
-	NOUN_CLOSE = 0xB,
-	NOUN_THROW = 0xC,
-	NOUN_WALK_TO = 0xD,
-	NOUN_ACTIVATE = 0xE,
-	NOUN_ADMIRE = 0xF,
+	//NOUN_GAME = 0x1,
+	//NOUN_QSAVE = 0x2,
+	//NOUN_LOOK = 0x3,
+	//NOUN_TAKE = 0x4,
+	//NOUN_PUSH = 0x5,
+	//NOUN_OPEN = 0x6,
+	//NOUN_PUT = 0x7,
+	//NOUN_TALK_TO = 0x8,
+	//NOUN_GIVE = 0x9,
+	//NOUN_PULL = 0xA,
+	//NOUN_CLOSE = 0xB,
+	//NOUN_THROW = 0xC,
+	//NOUN_WALK_TO = 0xD,
+	//NOUN_ACTIVATE = 0xE,
+	//NOUN_ADMIRE = 0xF,
 	NOUN_ADSM = 0x10,
 	NOUN_AIR_VENT = 0x11,
 	NOUN_ALOE_PLANT = 0x12,
@@ -122,7 +128,7 @@ enum Noun {
 	NOUN_AREA_TO_SOUTH = 0x16,
 	NOUN_AREA_TO_WEST = 0x17,
 	NOUN_AROMATIC_MEAT = 0x18,
-	NOUN_ATTACH = 0x19,
+	//NOUN_ATTACH = 0x19,
 	NOUN_AUDIO_TAPE = 0x1A,
 	NOUN_AUXILIARY_POWER = 0x1B,
 	NOUN_BADMITTON_BRAT = 0x1C,
@@ -147,8 +153,8 @@ enum Noun {
 	NOUN_BOULDER = 0x2F,
 	NOUN_BOULDERS = 0x30,
 	NOUN_BRA = 0x31,
-	NOUN_BREAK = 0x32,
-	NOUN_BREATHE_AIR = 0x33,
+	//NOUN_BREAK = 0x32,
+	//NOUN_BREATHE_AIR = 0x33,
 	NOUN_BULKHEAD = 0x34,
 	NOUN_BURGER = 0x35,
 	NOUN_BURN = 0x36,
@@ -158,7 +164,7 @@ enum Noun {
 	NOUN_BUSHY_FERN = 0x3A,
 	NOUN_CACTUS = 0x3B,
 	NOUN_CARD = 0x3C,
-	NOUN_CAST = 0x3D,
+	//NOUN_CAST = 0x3D,
 	NOUN_CAULDRON = 0x3E,
 	NOUN_CAVE = 0x3F,
 	NOUN_CAVE_CEILING = 0x40,
@@ -194,10 +200,10 @@ enum Noun {
 	NOUN_CURIOUS_WEED_PATCH = 0x5E,
 	NOUN_CURTAIN = 0x5F,
 	NOUN_CURTAINS = 0x60,
-	NOUN_CUT = 0x61,
+	//NOUN_CUT = 0x61,
 	NOUN_DAMAGE_CONTROL = 0x62,
 	NOUN_DAMAGE_CONTROL_PANEL = 0x63,
-	NOUN_DAMPEN = 0x64,
+	//NOUN_DAMPEN = 0x64,
 	NOUN_DEAD_FISH = 0x65,
 	NOUN_DEAD_PURPLE_MONSTER = 0x66,
 	NOUN_DECLIVITOUS_CHASM = 0x67,
@@ -205,24 +211,24 @@ enum Noun {
 	NOUN_DENSE_FOREST = 0x69,
 	NOUN_DETONATORS = 0x6A,
 	NOUN_DINO_MITE = 0x6B,
-	NOUN_DISASSEMBLE = 0x6C,
-	NOUN_DIVE_INTO = 0x6D,
+	//NOUN_DISASSEMBLE = 0x6C,
+	//NOUN_DIVE_INTO = 0x6D,
 	NOUN_DOOR = 0x6E,
 	NOUN_DOOR_KEY = 0x6F,
 	NOUN_DOORWAY = 0x70,
 	NOUN_DRAWER = 0x71,
-	NOUN_DRINK = 0x72,
+	//NOUN_DRINK = 0x72,
 	NOUN_DURAFAIL_CELLS = 0x73,
 	NOUN_EASTERN_CLIFF_FACE = 0x74,
-	NOUN_EAT = 0x75,
-	NOUN_EJECT = 0x76,
-	NOUN_EMPTY = 0x77,
+	//NOUN_EAT = 0x75,
+	//NOUN_EJECT = 0x76,
+	//NOUN_EMPTY = 0x77,
 	NOUN_ENGINEERING_CONTROLS = 0x78,
 	NOUN_ENGINEERING_SECTION = 0x79,
 	NOUN_ENTER_KEY = 0x7A,
 	NOUN_ESCAPE_HATCH = 0x7B,
 	NOUN_ESTROTOXIN = 0x7C,
-	NOUN_EXAMINE = 0x7D,
+	//NOUN_EXAMINE = 0x7D,
 	NOUN_EXPERIMENT_CAGE = 0x7E,
 	NOUN_EXTINGUISH = 0x7F,
 	NOUN_FACE_ID = 0x80,
@@ -237,36 +243,36 @@ enum Noun {
 	NOUN_FLOOR = 0x89,
 	NOUN_FLOOR_OF_HUT = 0x8A,
 	NOUN_FLOOR_TILE = 0x8B,
-	NOUN_FONDLE = 0x8C,
+	//NOUN_FONDLE = 0x8C,
 	NOUN_FOREST_TO_EAST = 0x8D,
 	NOUN_FRONT_WINDOW = 0x8E,
 	NOUN_FUNGOIDS = 0x8F,
 	NOUN_FURNACE = 0x90,
 	NOUN_FUZZY_DICE = 0x91,
-	NOUN_GAZE = 0x92,
-	NOUN_GAZE_AT = 0x93,
-	NOUN_GAZE_IN = 0x94,
-	NOUN_GLANCE_AT = 0x95,
+	//NOUN_GAZE = 0x92,
+	//NOUN_GAZE_AT = 0x93,
+	//NOUN_GAZE_IN = 0x94,
+	//NOUN_GLANCE_AT = 0x95,
 	NOUN_GLOVE = 0x96,
 	NOUN_GNARLY_SHRUB = 0x97,
-	NOUN_GNAW_ON = 0x98,
-	NOUN_GORGE_ON = 0x99,
+	//NOUN_GNAW_ON = 0x98,
+	//NOUN_GORGE_ON = 0x99,
 	NOUN_GRAIN_ALCHOHOL = 0x9A,
 	NOUN_GRASSLAND_TO_EAST = 0x9B,
 	NOUN_GRASSLAND_TO_SOUTH = 0x9C,
 	NOUN_GRASSY_AREA = 0x9D,
 	NOUN_GRASSY_AREA_TO_NORTH = 0x9E,
 	NOUN_GRASSY_KNOLL = 0x9F,
-	NOUN_GRIND = 0xA0,
+	//NOUN_GRIND = 0xA0,
 	NOUN_GROOVILACTIC_TREE = 0xA1,
 	NOUN_GUARDS_ARM = 0xA2,
 	NOUN_HATCHWAY = 0xA3,
-	NOUN_HOOK_UP = 0xA4,
+	//NOUN_HOOK_UP = 0xA4,
 	NOUN_HORIZON = 0xA5,
-	NOUN_HOSE_DOWN = 0xA6,
+	//NOUN_HOSE_DOWN = 0xA6,
 	NOUN_HOTPANTS = 0xA7,
 	NOUN_HULL = 0xA8,
-	NOUN_HURL = 0xA9,
+	//NOUN_HURL = 0xA9,
 	NOUN_HUT = 0xAA,
 	NOUN_HUT_AREA = 0xAB,
 	NOUN_HUT_TO_EAST = 0xAC,
@@ -277,10 +283,10 @@ enum Noun {
 	NOUN_HYDROSPANNER = 0xB1,
 	NOUN_HYPERDRIVE_JUMP_UNIT = 0xB2,
 	NOUN_ID_CARD = 0xB3,
-	NOUN_IGNITE = 0xB4,
-	NOUN_INFLATE = 0xB5,
-	NOUN_INSERT = 0xB6,
-	NOUN_INSPECT = 0xB7,
+	//NOUN_IGNITE = 0xB4,
+	//NOUN_INFLATE = 0xB5,
+	//NOUN_INSERT = 0xB6,
+	//NOUN_INSPECT = 0xB7,
 	NOUN_JUNGLE = 0xB8,
 	NOUN_JUNGLE_TO_EAST = 0xB9,
 	NOUN_JUNGLE_TO_WEST = 0xBA,
@@ -298,17 +304,17 @@ enum Noun {
 	NOUN_KNIFE = 0xC6,
 	NOUN_LADDER = 0xC7,
 	NOUN_LARGE_STALAGMITE = 0xC8,
-	NOUN_LEER_AT = 0xC9,
+	//NOUN_LEER_AT = 0xC9,
 	NOUN_LIBRARY_COMPUTER = 0xCA,
-	NOUN_LICK = 0xCB,
+	//NOUN_LICK = 0xCB,
 	NOUN_LIFE_SUPPORT_SECTION = 0xCC,
 	NOUN_LIGHT = 0xCD,
-	NOUN_LOAD = 0xCE,
-	NOUN_LOCK = 0xCF,
+	//NOUN_LOAD = 0xCE,
+	//NOUN_LOCK = 0xCF,
 	NOUN_LOG = 0xD0,
-	NOUN_LOOK_AT = 0xD1,
-	NOUN_LOOK_IN = 0xD2,
-	NOUN_LOOK_THROUGH = 0xD3,
+	//NOUN_LOOK_AT = 0xD1,
+	//NOUN_LOOK_IN = 0xD2,
+	//NOUN_LOOK_THROUGH = 0xD3,
 	NOUN_LOUNGE_AREA = 0xD4,
 	NOUN_LOVE_ALTAR = 0xD5,
 	NOUN_LOWLANDS = 0xD6,
@@ -371,7 +377,7 @@ enum Noun {
 	NOUN_PLANT_STALK = 0x10F,
 	NOUN_PLANTS = 0x110,
 	NOUN_PLASTIC_JESUS = 0x111,
-	NOUN_PLAY = 0x112,
+	//NOUN_PLAY = 0x112,
 	NOUN_PLUNGER = 0x113,
 	NOUN_POISON_DARTS = 0x114,
 	NOUN_POLYCEMENT = 0x115,
@@ -379,12 +385,12 @@ enum Noun {
 	NOUN_POSTER = 0x117,
 	NOUN_POWER_STATUS_PANEL = 0x118,
 	NOUN_PRECIPICE = 0x119,
-	NOUN_PRESS = 0x11A,
+	//NOUN_PRESS = 0x11A,
 	NOUN_PRESSURE_GAUGE = 0x11B,
-	NOUN_PRY = 0x11C,
+	//NOUN_PRY = 0x11C,
 	NOUN_RAGING_RIVER = 0x11D,
 	NOUN_RAMOLYAN_RUGBY_RATS = 0x11E,
-	NOUN_READ = 0x11F,
+	//NOUN_READ = 0x11F,
 	NOUN_REARVIEW_MIRROR = 0x120,
 	NOUN_REBREATHER = 0x121,
 	NOUN_REFRIGERATOR = 0x122,
@@ -403,7 +409,7 @@ enum Noun {
 	NOUN_SEAWEED = 0x12F,
 	NOUN_SEAWEED_BANK = 0x130,
 	NOUN_SECURITY_CARD = 0x131,
-	NOUN_SET = 0x132,
+	//NOUN_SET = 0x132,
 	NOUN_SHAKE_HANDS = 0x133,
 	NOUN_SHARPEN = 0x134,
 	NOUN_SHIELD_ACCESS_PANEL = 0x135,
@@ -411,48 +417,48 @@ enum Noun {
 	NOUN_SHIELD_MODULATOR = 0x137,
 	NOUN_SHIELD_STATUS_PANEL = 0x138,
 	NOUN_SHIP = 0x139,
-	NOUN_SHOOT = 0x13A,
+	//NOUN_SHOOT = 0x13A,
 	NOUN_SHOVEL = 0x13B,
-	NOUN_SHRED = 0x13C,
+	//NOUN_SHRED = 0x13C,
 	NOUN_SHRUNKEN_HEADS = 0x13D,
 	NOUN_SINGED_MEAT = 0x13E,
-	NOUN_SIT_IN = 0x13F,
+	//NOUN_SIT_IN = 0x13F,
 	NOUN_SKULL = 0x140,
 	NOUN_SKULL_AND_CROSSBONES = 0x141,
 	NOUN_SKY = 0x142,
-	NOUN_SLEEP_ON = 0x143,
+	//NOUN_SLEEP_ON = 0x143,
 	NOUN_SLITHERING_SNAKE = 0x144,
 	NOUN_SLUG_SECRETION = 0x145,
 	NOUN_SMALL_HOLE = 0x146,
-	NOUN_SMELL = 0x147,
+	//NOUN_SMELL = 0x147,
 	NOUN_SNAKE = 0x148,
-	NOUN_SNIFF = 0x149,
-	NOUN_SOAK = 0x14A,
+	//NOUN_SNIFF = 0x149,
+	//NOUN_SOAK = 0x14A,
 	NOUN_SPECIAL_KEY_1 = 0x14B,
 	NOUN_SPECIAL_KEY_2 = 0x14C,
 	NOUN_SPIDER = 0x14D,
 	NOUN_SPILT_MILK = 0x14E,
 	NOUN_SPIT_FIRE = 0x14F,
-	NOUN_SPRAY = 0x150,
-	NOUN_STAB = 0x151,
+	//NOUN_SPRAY = 0x150,
+	//NOUN_STAB = 0x151,
 	NOUN_STAIRS = 0x152,
 	NOUN_STALAGMITES = 0x153,
-	NOUN_STAND_INSIDE = 0x154,
-	NOUN_STARE_AT = 0x155,
+	//NOUN_STAND_INSIDE = 0x154,
+	//NOUN_STARE_AT = 0x155,
 	NOUN_STEPS = 0x156,
 	NOUN_STUFFED_FISH = 0x157,
 	NOUN_SURFACE = 0x158,
-	NOUN_SWIM_ACROSS = 0x159,
-	NOUN_SWIM_INTO = 0x15A,
-	NOUN_SWIM_THROUGH = 0x15B,
-	NOUN_SWIM_TO = 0x15C,
-	NOUN_SWIM_TOWARDS = 0x15D,
-	NOUN_SWIM_UNDER = 0x15E,
+	//NOUN_SWIM_ACROSS = 0x159,
+	//NOUN_SWIM_INTO = 0x15A,
+	//NOUN_SWIM_THROUGH = 0x15B,
+	//NOUN_SWIM_TO = 0x15C,
+	//NOUN_SWIM_TOWARDS = 0x15D,
+	//NOUN_SWIM_UNDER = 0x15E,
 	NOUN_SWOOPING_CREATURE = 0x15F,
 	NOUN_TABLE = 0x160,
-	NOUN_TAKE_LIVER = 0x161,
-	NOUN_TAKE_OFF = 0x162,
-	NOUN_TAKE_PAGE = 0x163,
+	//NOUN_TAKE_LIVER = 0x161,
+	//NOUN_TAKE_OFF = 0x162,
+	//NOUN_TAKE_PAGE = 0x163,
 	NOUN_TALL_GRASS = 0x164,
 	NOUN_TAPE_PLAYER = 0x165,
 	NOUN_TARGET_COMPUTER = 0x166,
@@ -465,7 +471,7 @@ enum Noun {
 	NOUN_THATCHED_ROOF = 0x16D,
 	NOUN_THORNS = 0x16E,
 	NOUN_THORNY_BUSH = 0x16F,
-	NOUN_TIE = 0x170,
+	//NOUN_TIE = 0x170,
 	NOUN_TIMEBOMB = 0x171,
 	NOUN_TIMER = 0x172,
 	NOUN_TIMER_MODULE = 0x173,
@@ -476,11 +482,11 @@ enum Noun {
 	NOUN_TUNNEL = 0x178,
 	NOUN_TWINKIE_BUSH = 0x179,
 	NOUN_TWINKIFRUIT = 0x17A,
-	NOUN_UNLOCK = 0x17B,
+	//NOUN_UNLOCK = 0x17B,
 	NOUN_UZI = 0x17C,
 	NOUN_VASE = 0x17D,
 	NOUN_VIDEO_GAME = 0x17E,
-	NOUN_VIEW = 0x17F,
+	//NOUN_VIEW = 0x17F,
 	NOUN_VIEW_SCREEN = 0x180,
 	NOUN_VIEWPORT = 0x181,
 	NOUN_VILLAGE_AREA = 0x182,
@@ -488,17 +494,17 @@ enum Noun {
 	NOUN_VOLCANO = 0x184,
 	NOUN_VULTURE = 0x185,
 	NOUN_WAD_OF_CATTLE_PARTS = 0x186,
-	NOUN_WALK_ACROSS = 0x187,
-	NOUN_WALK_INSIDE = 0x188,
-	NOUN_WALK_ON = 0x189,
-	NOUN_WALK_OUTSIDE = 0x18A,
-	NOUN_WALK_THROUGH = 0x18B,
-	NOUN_WALK_TOWARDS = 0x18C,
+	//NOUN_WALK_ACROSS = 0x187,
+	//NOUN_WALK_INSIDE = 0x188,
+	//NOUN_WALK_ON = 0x189,
+	//NOUN_WALK_OUTSIDE = 0x18A,
+	//NOUN_WALK_THROUGH = 0x18B,
+	//NOUN_WALK_TOWARDS = 0x18C,
 	NOUN_WALL = 0x18D,
 	NOUN_WATCH_TOWER = 0x18E,
 	NOUN_WATER = 0x18F,
 	NOUN_WEAPONS_DISPLAY = 0x190,
-	NOUN_WEAR = 0x191,
+	//NOUN_WEAR = 0x191,
 	NOUN_WEATHER_STATION = 0x192,
 	NOUN_WEATHER_VANE = 0x193,
 	NOUN_WEIGHT_MACHINE = 0x194,
@@ -507,7 +513,7 @@ enum Noun {
 	NOUN_WINDOW = 0x197,
 	NOUN_WITCHDOCTOR_HUT = 0x198,
 	NOUN_WORKBENCH = 0x199,
-	NOUN_WRITE_ON = 0x19A,
+	//NOUN_WRITE_ON = 0x19A,
 	NOUN_YELLOW_BIRDY = 0x19B,
 	NOUN_GRASS = 0x19C,
 	NOUN_BOUNCING_REPTILE = 0x19D,
@@ -526,7 +532,7 @@ enum Noun {
 	NOUN_PILE_OF_LEAVES = 0x1AA,
 	NOUN_OPEN_FIELD_TO_EAST = 0x1AB,
 	NOUN_LAWN = 0x1AC,
-	NOUN_WALK_DOWN = 0x1AD,
+	//NOUN_WALK_DOWN = 0x1AD,
 	NOUN_PATH_TO_WEST = 0x1AE,
 	NOUN_HEDGE = 0x1AF,
 	NOUN_VILLAGE_PATH = 0x1B0,
@@ -558,8 +564,8 @@ enum Noun {
 	NOUN_BAG_OF_TWINKIFRUITS = 0x1CA,
 	NOUN_BED = 0x1CB,
 	NOUN_DISPLAY = 0x1CC,
-	NOUN_LEAVE = 0x1CD,
-	NOUN_EXIT_FROM = 0x1CE,
+	//NOUN_LEAVE = 0x1CD,
+	//NOUN_EXIT_FROM = 0x1CE,
 	NOUN_DEVICE = 0x1CF,
 	NOUN_0_KEY = 0x1D0,
 	NOUN_1_KEY = 0x1D1,
@@ -597,7 +603,7 @@ enum Noun {
 	NOUN_ELECTRO_SCANNER = 0x1F1,
 	NOUN_HALL = 0x1F2,
 	NOUN_SCANNER = 0x1F3,
-	NOUN_PLACE_HAND_ON = 0x1F4,
+	//NOUN_PLACE_HAND_ON = 0x1F4,
 	NOUN_SECURITY_MONITOR = 0x1F5,
 	NOUN_DIGITORAMA = 0x1F6,
 	NOUN_RAIL_BEAM = 0x1F7,
@@ -618,16 +624,16 @@ enum Noun {
 	NOUN_AIR_DUCT = 0x206,
 	NOUN_CELL_WALL = 0x207,
 	NOUN_LIGHTS = 0x208,
-	NOUN_STARE_INTO = 0x209,
+	//NOUN_STARE_INTO = 0x209,
 	NOUN_CELL_CONTROLS = 0x20A,
 	NOUN_COMMODE = 0x20B,
-	NOUN_USE = 0x20C,
+	//NOUN_USE = 0x20C,
 	NOUN_BASIN = 0x20D,
-	NOUN_JUMP_INSIDE = 0x20E,
+	//NOUN_JUMP_INSIDE = 0x20E,
 	NOUN_PREVIOUS_CELL = 0x20F,
 	NOUN_NEXT_ROOM = 0x210,
 	NOUN_ZINK = 0x211,
-	NOUN_GAZE_INTO = 0x212,
+	//NOUN_GAZE_INTO = 0x212,
 	NOUN_THRONE = 0x213,
 	NOUN_SACK = 0x214,
 	NOUN_LIMB = 0x215,
@@ -640,7 +646,7 @@ enum Noun {
 	NOUN_MONITOR_AREA = 0x21C,
 	NOUN_SIDEWALL = 0x21D,
 	NOUN_COFFEE_MUG = 0x21E,
-	NOUN_SIT_AT = 0x21F,
+	//NOUN_SIT_AT = 0x21F,
 	NOUN_LIGHTING_FIXTURE = 0x220,
 	NOUN_MONITORS = 0x221,
 	NOUN_GENDER_CONTROLS = 0x222,
@@ -648,7 +654,7 @@ enum Noun {
 	NOUN_MOLECULAR_RECORDER = 0x224,
 	NOUN_MAINTENANCE_PANEL = 0x225,
 	NOUN_RAMP = 0x226,
-	NOUN_WALK_UP = 0x227,
+	//NOUN_WALK_UP = 0x227,
 	NOUN_SUBSONIC_ATOMIZER = 0x228,
 	NOUN_EIGHT_BALL = 0x229,
 	NOUN_DNA_INVERTER = 0x22A,
@@ -665,7 +671,7 @@ enum Noun {
 	NOUN_SHOCK_MACHINE = 0x235,
 	NOUN_INTERROGATION_TABLE = 0x236,
 	NOUN_LIE_DOWN_ON = 0x237,
-	NOUN_DECIPHER = 0x238,
+	//NOUN_DECIPHER = 0x238,
 	NOUN_GUARD = 0x239,
 	NOUN_RIP_IN_FLOOR = 0x23A,
 	NOUN_TELEPORT_AREA = 0x23B,
@@ -675,7 +681,7 @@ enum Noun {
 	NOUN_WALL_BOARD = 0x23F,
 	NOUN_GENDER_SCANNER = 0x240,
 	NOUN_BAR = 0x241,
-	NOUN_WALK_INTO = 0x242,
+	//NOUN_WALK_INTO = 0x242,
 	NOUN_HALLWAY_TO_SOUTH = 0x243,
 	NOUN_SIGN = 0x244,
 	NOUN_HALLWAY_TO_NORTH = 0x245,
@@ -787,7 +793,7 @@ enum Noun {
 	NOUN_CONTROL_STATION = 0x2AF,
 	NOUN_STRANGE_MONSTER = 0x2B0,
 	NOUN_GHASTLY_BEAST = 0x2B1,
-	NOUN_GAWK_AT = 0x2B2,
+	//NOUN_GAWK_AT = 0x2B2,
 	NOUN_CORRIDOR_TO_SOUTH = 0x2B3,
 	NOUN_CORRIDOR_TO_NORTH = 0x2B4,
 	NOUN_WALK_ONTO = 0x2B5,
@@ -822,7 +828,7 @@ enum Noun {
 	NOUN_BLOOD_STAIN = 0x2D2,
 	NOUN_GRATE = 0x2D3,
 	NOUN_AIR_SHAFT = 0x2D4,
-	NOUN_RETURN_TO = 0x2D5,
+	//NOUN_RETURN_TO = 0x2D5,
 	NOUN_FORMALDEHYDE = 0x2D6,
 	NOUN_PETROX = 0x2D7,
 	NOUN_SODIUM_BENZOATE = 0x2D8,
@@ -858,15 +864,15 @@ enum Noun {
 	NOUN_LAMP = 0x2F6,
 	NOUN_CLIMB_INTO = 0x2F7,
 	NOUN_LIGHT_BULB = 0x2F8,
-	NOUN_STEP_INTO = 0x2F9,
+	//NOUN_STEP_INTO = 0x2F9,
 	NOUN_ROOM = 0x2FA,
-	NOUN_CRAWL_TO = 0x2FB,
+	//NOUN_CRAWL_TO = 0x2FB,
 	NOUN_FOURTH_CELL = 0x2FC,
 	NOUN_THIRD_CELL = 0x2FD,
 	NOUN_SECOND_CELL = 0x2FE,
 	NOUN_FIRST_CELL = 0x2FF,
 	NOUN_EQUIPMENT_ROOM = 0x300,
-	NOUN_CRAWL_DOWN = 0x301,
+	//NOUN_CRAWL_DOWN = 0x301,
 	NOUN_DESCENDING_SHAFT = 0x302,
 	NOUN_SAUROPOD = 0x303,
 	NOUN_MONSTER = 0x304,
@@ -876,14 +882,14 @@ enum Noun {
 	NOUN_INSTRUMENT_TABLE = 0x308,
 	NOUN_WOMAN_ON_BALCONY = 0x309,
 	NOUN_WOMAN_IN_CHAIR = 0x30A,
-	NOUN_SIT_ON = 0x30B,
+	//NOUN_SIT_ON = 0x30B,
 	NOUN_WOMAN_IN_ALCOVE = 0x30C,
 	NOUN_KETTLE = 0x30D,
 	NOUN_BARTENDER = 0x30E,
 	NOUN_WHISKEY = 0x30F,
 	NOUN_ALCOHOL = 0x310,
 	NOUN_RIM = 0x311,
-	NOUN_WALK_ALONG = 0x312,
+	//NOUN_WALK_ALONG = 0x312,
 	NOUN_SUBMERGED_CITY = 0x313,
 	NOUN_GOVERNORS_HOUSE = 0x314,
 	NOUN_RIM_TOWARDS_EAST = 0x315,
@@ -902,7 +908,7 @@ enum Noun {
 	NOUN_SIDEWALK_TO_EAST = 0x322,
 	NOUN_BUILDING = 0x323,
 	NOUN_CAR = 0x324,
-	NOUN_GET_INSIDE = 0x325,
+	//NOUN_GET_INSIDE = 0x325,
 	NOUN_MARQUEE = 0x326,
 	NOUN_BUILDING_ENTRANCE = 0x327,
 	NOUN_GUARD_STATION = 0x328,
@@ -912,7 +918,7 @@ enum Noun {
 	NOUN_PAPERS = 0x32C,
 	NOUN_FILE_CABINET = 0x32D,
 	NOUN_WINDOWS = 0x32E,
-	NOUN_WALK = 0x32F,
+	//NOUN_WALK = 0x32F,
 	NOUN_STORAGE_BOX = 0x330,
 	NOUN_WATER_COOLER = 0x331,
 	NOUN_BOX = 0x332,
@@ -966,12 +972,12 @@ enum Noun {
 	NOUN_TELEPORTER_ENTRANCE = 0x362,
 	NOUN_SOFTWARE_DOOR = 0x363,
 	NOUN_SPINACH_PATCH_DOLL = 0x364,
-	NOUN_REFLECT = 0x365,
+	//NOUN_REFLECT = 0x365,
 	NOUN_REGISTER_DRAWER = 0x366,
 	NOUN_ELEVATOR_DOOR = 0x367,
 	NOUN_HYDRAULIC_SUPPORT = 0x368,
 	NOUN_EQUIPMENT_OVERHEAD = 0x369,
-	NOUN_GET_INTO = 0x36A,
+	//NOUN_GET_INTO = 0x36A,
 	NOUN_WARNING_LABEL = 0x36B,
 	NOUN_NUCLEAR_SLINGSHOT = 0x36C,
 	NOUN_DISPLAY_CASE = 0x36D,
@@ -1031,7 +1037,7 @@ enum Noun {
 	NOUN_WELCOME_MAT = 0x3A3,
 	NOUN_MELON_MUSH = 0x3A4,
 	NOUN_BADMINTON_BRAT = 0x3A5,
-	NOUN_APPLY = 0x3A6,
+	//NOUN_APPLY = 0x3A6,
 	NOUN_COMBINATION = 0x3A7,
 	NOUN_NOTE = 0x3A8,
 	NOUN_LECITHIN = 0x3A9,
@@ -1048,8 +1054,8 @@ enum Noun {
 	NOUN_OPEN_WATER_TO_SOUTH = 0x3B4,
 	NOUN_PROJECTOR = 0x3B5,
 	NOUN_GUARDS_ARM2 = 0x3B6,
-	NOUN_NIBBLE_ON = 0x3B7,
-	NOUN_ENTER = 0x3B8,
+	//NOUN_NIBBLE_ON = 0x3B7,
+	//NOUN_ENTER = 0x3B8,
 	NOUN_ = 0x3B9,
 	NOUN_TIMER_BUTTON_1 = 0x3BA,
 	NOUN_REMOTE_BUTTON_1 = 0x3BB,
@@ -1293,8 +1299,8 @@ enum Noun {
 	NOUN_WEST_END_OF_PLATFORM = 0x4A9,
 	NOUN_EAST_END_OF_PLATFORM = 0x4AA,
 	NOUN_FOLD = 0x4AB,
-	NOUN_SPINDLE = 0x4AC,
-	NOUN_MUTILATE = 0x4AD
+	NOUN_SPINDLE = 0x4AC
+	//NOUN_MUTILATE = 0x4AD
 };
 
 class SceneFactory {
diff --git a/engines/mads/nebular/nebular_scenes2.cpp b/engines/mads/nebular/nebular_scenes2.cpp
index 083b649a1a..b2076a2b7c 100644
--- a/engines/mads/nebular/nebular_scenes2.cpp
+++ b/engines/mads/nebular/nebular_scenes2.cpp
@@ -4917,7 +4917,7 @@ void Scene214::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_CAPTIVE_CREATURE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene214::enter() {
diff --git a/engines/mads/nebular/nebular_scenes3.cpp b/engines/mads/nebular/nebular_scenes3.cpp
index 95fdd0031a..8209f0c1da 100644
--- a/engines/mads/nebular/nebular_scenes3.cpp
+++ b/engines/mads/nebular/nebular_scenes3.cpp
@@ -3868,7 +3868,7 @@ void Scene351::setup() {
 
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene351::enter() {
@@ -4027,7 +4027,7 @@ void Scene352::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_YOUR_STUFF);
 	_scene->addActiveVocab(NOUN_OTHER_STUFF);
 	_scene->addActiveVocab(NOUN_LAMP);
@@ -4815,7 +4815,7 @@ void Scene358::actions() {
 void Scene359::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene359::enter() {
diff --git a/engines/mads/nebular/nebular_scenes4.cpp b/engines/mads/nebular/nebular_scenes4.cpp
index 5a68887b8d..195bba577d 100644
--- a/engines/mads/nebular/nebular_scenes4.cpp
+++ b/engines/mads/nebular/nebular_scenes4.cpp
@@ -237,13 +237,13 @@ void Scene402::setup() {
 
 	_scene->addActiveVocab(NOUN_BARTENDER);
 	_scene->addActiveVocab(NOUN_ALIEN_LIQUOR);
-	_scene->addActiveVocab(NOUN_DRINK);
+	_scene->addActiveVocab(VERB_DRINK);
 	_scene->addActiveVocab(NOUN_BINOCULARS);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_CREDIT_CHIP);
-	_scene->addActiveVocab(NOUN_TAKE);
+	_scene->addActiveVocab(VERB_TAKE);
 	_scene->addActiveVocab(NOUN_REPAIR_LIST);
-	_scene->addActiveVocab(NOUN_LOOK_AT);
+	_scene->addActiveVocab(VERB_LOOK_AT);
 }
 
 void Scene402::synchronize(Common::Serializer &s) {
@@ -2850,7 +2850,7 @@ void Scene408::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_TARGET_MODULE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene408::enter() {
@@ -3464,7 +3464,7 @@ void Scene411::giveToRex(int object) {
 void Scene411::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_ALIEN_LIQUOR);
 	_scene->addActiveVocab(NOUN_FORMALDEHYDE);
 	_scene->addActiveVocab(NOUN_PETROX);
diff --git a/engines/mads/nebular/nebular_scenes5.cpp b/engines/mads/nebular/nebular_scenes5.cpp
index b55262c135..fb79492b1c 100644
--- a/engines/mads/nebular/nebular_scenes5.cpp
+++ b/engines/mads/nebular/nebular_scenes5.cpp
@@ -96,7 +96,7 @@ void Scene501::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_DOOR);
-	_scene->addActiveVocab(NOUN_WALK_THROUGH);
+	_scene->addActiveVocab(VERB_WALK_THROUGH);
 }
 
 void Scene501::synchronize(Common::Serializer &s) {
@@ -527,7 +527,7 @@ void Scene503::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_DETONATORS);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene503::enter() {
@@ -1099,7 +1099,7 @@ void Scene505::actions() {
 void Scene506::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_INTO);
+	_scene->addActiveVocab(VERB_WALK_INTO);
 	_scene->addActiveVocab(NOUN_SOFTWARE_STORE);
 	_scene->addActiveVocab(NOUN_LABORATORY);
 }
@@ -1362,7 +1362,7 @@ void Scene507::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_PENLIGHT);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene507::enter() {
@@ -1473,7 +1473,7 @@ void Scene508::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_SPINACH_PATCH_DOLL);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_LASER_BEAM);
 }
 
@@ -1733,7 +1733,7 @@ void Scene511::setup() {
 	setAAName();
 	_scene->addActiveVocab(NOUN_BOAT);
 	_scene->addActiveVocab(NOUN_FISHING_LINE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene511::enter() {
@@ -2053,7 +2053,7 @@ void Scene512::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_FISHING_ROD);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_PADLOCK_KEY);
 	_scene->addActiveVocab(NOUN_REGISTER_DRAWER);
 }
@@ -2347,7 +2347,7 @@ void Scene513::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_ELEVATOR_DOOR);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene513::enter() {
diff --git a/engines/mads/nebular/nebular_scenes6.cpp b/engines/mads/nebular/nebular_scenes6.cpp
index 6cea5cb63a..e9c4473f9e 100644
--- a/engines/mads/nebular/nebular_scenes6.cpp
+++ b/engines/mads/nebular/nebular_scenes6.cpp
@@ -87,7 +87,7 @@ void Scene601::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_LASER_BEAM);
-	_scene->addActiveVocab(NOUN_LOOK_AT);
+	_scene->addActiveVocab(VERB_LOOK_AT);
 }
 
 void Scene601::enter() {
@@ -220,7 +220,7 @@ void Scene601::actions() {
 void Scene602::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_SAFE);
 	_scene->addActiveVocab(NOUN_LASER_BEAM);
 }
@@ -533,7 +533,7 @@ void Scene602::actions() {
 void Scene603::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_COMPACT_CASE);
 	_scene->addActiveVocab(NOUN_NOTE);
 }
@@ -1421,7 +1421,7 @@ void Scene607::actions() {
 void Scene608::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_POLYCEMENT);
 	_scene->addActiveVocab(NOUN_CAR);
 	_scene->addActiveVocab(NOUN_OBNOXIOUS_DOG);
@@ -2705,7 +2705,7 @@ void Scene610::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_PHONE_HANDSET);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene610::enter() {
@@ -2888,7 +2888,7 @@ void Scene611::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_RAT);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene611::handleRatMoves() {
@@ -4263,7 +4263,7 @@ void Scene612::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_FISHING_LINE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene612::handleWinchMovement() {
diff --git a/engines/mads/nebular/nebular_scenes7.cpp b/engines/mads/nebular/nebular_scenes7.cpp
index c0755e83aa..5c1f7bfef7 100644
--- a/engines/mads/nebular/nebular_scenes7.cpp
+++ b/engines/mads/nebular/nebular_scenes7.cpp
@@ -1074,7 +1074,7 @@ void Scene704::setup() {
 	_game._player._spritesPrefix = "";
 	setAAName();
 	_scene->addActiveVocab(NOUN_BOTTLE);
-	_scene->addActiveVocab(NOUN_LOOK_AT);
+	_scene->addActiveVocab(VERB_LOOK_AT);
 }
 
 void Scene704::handleBottleInterface() {
@@ -1678,7 +1678,7 @@ void Scene706::setup() {
 	setAAName();
 	_scene->addActiveVocab(NOUN_BOTTLE);
 	_scene->addActiveVocab(NOUN_VASE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene706::handleRexDeath() {
@@ -2086,7 +2086,7 @@ void Scene751::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_FISHING_LINE);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 }
 
 void Scene751::enter() {
diff --git a/engines/mads/nebular/nebular_scenes8.cpp b/engines/mads/nebular/nebular_scenes8.cpp
index 9c53855878..e6f8701623 100644
--- a/engines/mads/nebular/nebular_scenes8.cpp
+++ b/engines/mads/nebular/nebular_scenes8.cpp
@@ -306,7 +306,7 @@ void Scene802::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_SHIELD_MODULATOR);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 	_scene->addActiveVocab(NOUN_REMOTE);
 }
 
@@ -514,7 +514,7 @@ void Scene803::setup() {
 	setPlayerSpritesPrefix();
 	setAAName();
 	_scene->addActiveVocab(NOUN_GUTS);
-	_scene->addActiveVocab(NOUN_WALK_TO);
+	_scene->addActiveVocab(VERB_WALKTO);
 
 	if ((!_globals[kFromCockpit] && _globals[kReturnFromCut] && !_globals[kBeamIsUp])
 		|| (_globals[kFromCockpit] && !_globals[kExitShip])) {