Update debug tables

svn-id: r22029

1 files changed, 331 insertions, 331 deletions

diff --git a/engines/simon/debug.h b/engines/simon/debug.h
index f844adb629..fb3d155eed 100644
--- a/engines/simon/debug.h
+++ b/engines/simon/debug.h
@@ -24,15 +24,15 @@ namespace Simon {
 
 static const char *const simon1dos_opcode_name_table[256] = {
 	/* 0 */
-	"|INV_COND",
-	"IJ|PTRA_PARENT_IS",
-	"IJ|PTRA_PARENT_ISNOT",
+	"|NOT",
+	"IJ|AT",
+	"IJ|NOT_AT",
 	NULL,
 	/* 4 */
 	NULL,
-	"IJ|PARENT_IS_1",
-	"IJ|PARENT_ISNOT_1",
-	"IIJ|PARENT_IS",
+	"IJ|CARRIED",
+	"IJ|NOT_CARRIED",
+	"IIJ|IS_AT",
 	/* 8 */
 	NULL,
 	NULL,
@@ -57,9 +57,9 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	NULL,
 	"IJ|IS_ROOM",
 	"IJ|IS_OBJECT",
-	"IWJ|ITEM_UNK3_IS",
+	"IWJ|ITEM_STATE_IS",
 	/* 28 */
-	"IBJ|CHILD_HAS_FLAG",
+	"IBJ|OBJECT_HAS_FLAG",
 	NULL,
 	NULL,
 	"I|SET_NO_PARENT",
@@ -97,20 +97,20 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	"IB|SET_CHILD2_BIT",
 	"IB|CLEAR_CHILD2_BIT",
 	"II|MAKE_SIBLING",
-	"I|INC_UNK3",
+	"I|INC_STATE",
 	/* 60 */
-	"I|DEC_UNK3",
-	"IW|SET_UNK3",
+	"I|DEC_STATE",
+	"IW|SET_STATE",
 	"V|SHOW_INT",
 	"T|SHOW_STRING_NL",
 	/* 64 */
 	"T|SHOW_STRING",
-	"WWWWWB|ADD_HITAREA",
-	"BT|SET_ITEM_NAME",
-	"BT|SET_ITEM_DESC",
+	"WWWWWB|ADD_TEXT_BOX",
+	"BT|SET_SHORT_TEXT",
+	"BT|SET_LONG_TEXT",
 	/* 68 */
-	"x|HALT",
-	"x|RET1",
+	"x|END",
+	"x|DONE",
 	"V|SHOW_STRING_AR3",
 	"W|START_SUB",
 	/* 72 */
@@ -126,66 +126,66 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	/* 80 */
 	"IIJ|IS_ITEM_EQ",
 	NULL,
-	"B|UNK_82",
-	"|RETM10",
+	"B|DEBUG",
+	"|RESCAN",
 	/* 84 */
 	NULL,
 	NULL,
 	NULL,
-	"W|UNK_87",
+	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
 	"|RESTART_ANIMATION",
-	"IB|SET_M_TO_PARENT",
-	"IB|SET_M_TO_SIBLING",
+	"IB|GET_PARENT",
+	"IB|GET_NEXT",
 	/* 92 */
-	"IB|SET_M_TO_CHILD",
+	"IB|GET_CHILDREN",
 	NULL,
 	NULL,
 	NULL,
 	/* 96 */
-	"WB|UNK_96",
+	"WB|PICTURE",
 	"W|LOAD_ZONE",
-	"WBWWW|START_VGA",
-	"W|KILL_SPRITE",
+	"WBWWW|ANIMATE",
+	"W|STOP_ANIMATE",
 	/* 100 */
-	"|VGA_RESET",
+	"|KILL_ANIMATE",
 	"BWWWWWW|DEFINE_WINDOW",
 	"B|CHANGE_WINDOW",
-	"|UNK_103",
+	"|CLS",
 	/* 104 */
 	"B|CLOSE_WINDOW",
 	NULL,
 	NULL,
-	"WWWWWIW|ADD_ITEM_HITAREA",
+	"WWWWWIW|ADD_BOX",
 	/* 108 */
-	"W|DEL_HITAREA",
-	"W|CLEAR_HITAREA_0x40",
-	"W|SET_HITAREA_0x40",
-	"WWW|SET_HITAREA_XY",
+	"W|DEL_BOX",
+	"W|ENABLE_BOX",
+	"W|DISABLE_BOX",
+	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
 	NULL,
-	"IB|UNK_114",
-	"IBJ|HAS_FLAG",
+	"IB|DO_ICONS",
+	"IBJ|IS_CLASS",
 	/* 116 */
-	"IB|SET_FLAG",
-	"IB|CLEAR_FLAG",
+	"IB|SET_CLASS",
+	"IB|UNSET_CLASS",
 	NULL,
 	"W|WAIT_SYNC",
 	/* 120 */
 	"W|SYNC",
-	"BI|SET_VGA_ITEM",
+	"BI|DEF_OBJ",
 	NULL,
 	NULL,
 	/* 124 */
 	NULL,
 	"IJ|IS_SIBLING_WITH_A",
-	"IBB|UNK_126",
-	"WW|PLAY_MUSIC_RESOURCE",
+	"IBB|DO_CLASS_ICONS",
+	"WW|PLAY_TUNE",
 	/* 128 */
-	"W|GET_DUMMY_WORD",
-	"W|GET_WORD_COND_TRUE",
+	"W|WAIT_END_TUNE",
+	"W|IF_END_TUNE",
 	"Bww|SET_ADJ_NOUN",
 	NULL,
 	/* 132 */
@@ -194,12 +194,12 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	"|DUMMYPROC_134",
 	"|QUIT_IF_USER_PRESSES_Y",
 	/* 136 */
-	"IV|GET_ITEM_UNK3",
-	"B|UNK_137",
-	"|VGA_POINTER_OP_4",
+	"IV|COPY_SF",
+	"B|RESTORE_ICONS",
+	"|FREEZE_ZONES",
 	"II|SET_PARENT_SPECIAL",
 	/* 140 */
-	"|DEL_TE_AND_ADD_ONE",
+	"|CLEAR_TIMERS",
 	"BI|SET_M1_OR_M3",
 	"WJ|IS_HITAREA_0x40_CLEAR",
 	"I|START_ITEM_SUB",
@@ -227,10 +227,10 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	"B|SET_INK",
 	"BWBW|SETUP_TEXT",
 	"BBT|PRINT_STR",
-	"W|SOUND_1",
+	"W|PLAY_EFFECT",
 	/* 164 */
-	"|UNK_164",
-	"IWWJ|ITEM_UNK1_UNK2_IS",
+	"|getDollar2",
+	"IWWJ|IS_ADJ_NOUN",
 	"B|SET_BIT2",
 	"B|CLEAR_BIT2",
 	/* 168 */
@@ -242,35 +242,35 @@ static const char *const simon1dos_opcode_name_table[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"|VGA_POINTER_OP_1",
+	"|LOCK_ZONES",
 	/* 176 */
-	"|VGA_POINTER_OP_2",
-	"BBI|INVENTORY_DESCRIPTION",
-	"WWBB|PATHFIND",
-	"BBB|ROOM_DESCRIPTION",
+	"|UNLOCK_ZONES",
+	"BBI|SCREEN_TEXT_POBJ",
+	"WWBB|GETPATHPOSN",
+	"BBB|SCREEN_TEXT_LONG_TEXT",
 	/* 180 */
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
 	"|LOAD_BEARD",
 	"|UNLOAD_BEARD",
 	/* 184 */
-	"W|CLEAR_VGAPOINTER_ENTRY",
+	"W|UNLOAD_ZONE",
 	"W|LOAD_SOUND_FILES",
-	"|VGA_POINTER_OP_3",
+	"|UNFREEZE_ZONES",
 	"|FADE_TO_BLACK",
 };
 
 static const char *const simon1talkie_opcode_name_table[256] = {
 	/* 0 */
-	"|INV_COND",
-	"IJ|PTRA_PARENT_IS",
-	"IJ|PTRA_PARENT_ISNOT",
+	"|NOT",
+	"IJ|AT",
+	"IJ|NOT_AT",
 	NULL,
 	/* 4 */
 	NULL,
-	"IJ|PARENT_IS_1",
-	"IJ|PARENT_ISNOT_1",
-	"IIJ|PARENT_IS",
+	"IJ|CARRIED",
+	"IJ|NOT_CARRIED",
+	"IIJ|IS_AT",
 	/* 8 */
 	NULL,
 	NULL,
@@ -295,9 +295,9 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	NULL,
 	"IJ|IS_ROOM",
 	"IJ|IS_OBJECT",
-	"IWJ|ITEM_UNK3_IS",
+	"IWJ|ITEM_STATE_IS",
 	/* 28 */
-	"IBJ|CHILD_HAS_FLAG",
+	"IBJ|OBJECT_HAS_FLAG",
 	NULL,
 	NULL,
 	"I|SET_NO_PARENT",
@@ -335,20 +335,20 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	"IB|SET_CHILD2_BIT",
 	"IB|CLEAR_CHILD2_BIT",
 	"II|MAKE_SIBLING",
-	"I|INC_UNK3",
+	"I|INC_STATE",
 	/* 60 */
-	"I|DEC_UNK3",
-	"IW|SET_UNK3",
+	"I|DEC_STATE",
+	"IW|SET_STATE",
 	"V|SHOW_INT",
 	"T|SHOW_STRING_NL",
 	/* 64 */
 	"T|SHOW_STRING",
-	"WWWWWB|ADD_HITAREA",
-	"BT|SET_ITEM_NAME",
-	"BTw|SET_ITEM_DESC",
+	"WWWWWB|ADD_TEXT_BOX",
+	"BT|SET_SHORT_TEXT",
+	"BTw|SET_LONG_TEXT",
 	/* 68 */
-	"x|HALT",
-	"x|RET1",
+	"x|END",
+	"x|DONE",
 	"V|SHOW_STRING_AR3",
 	"W|START_SUB",
 	/* 72 */
@@ -364,66 +364,66 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	/* 80 */
 	"IIJ|IS_ITEM_EQ",
 	NULL,
-	"B|UNK_82",
-	"|RETM10",
+	"B|DEBUG",
+	"|RESCAN",
 	/* 84 */
 	NULL,
 	NULL,
 	NULL,
-	"W|UNK_87",
+	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
 	"|RESTART_ANIMATION",
-	"IB|SET_M_TO_PARENT",
-	"IB|SET_M_TO_SIBLING",
+	"IB|GET_PARENT",
+	"IB|GET_NEXT",
 	/* 92 */
-	"IB|SET_M_TO_CHILD",
+	"IB|GET_CHILDREN",
 	NULL,
 	NULL,
 	NULL,
 	/* 96 */
-	"WB|UNK_96",
+	"WB|PICTURE",
 	"W|LOAD_ZONE",
-	"WBWWW|START_VGA",
-	"W|KILL_SPRITE",
+	"WBWWW|ANIMATE",
+	"W|STOP_ANIMATE",
 	/* 100 */
-	"|VGA_RESET",
+	"|KILL_ANIMATE",
 	"BWWWWWW|DEFINE_WINDOW",
 	"B|CHANGE_WINDOW",
-	"|UNK_103",
+	"|CLS",
 	/* 104 */
 	"B|CLOSE_WINDOW",
 	NULL,
 	NULL,
-	"WWWWWIW|ADD_ITEM_HITAREA",
+	"WWWWWIW|ADD_BOX",
 	/* 108 */
-	"W|DEL_HITAREA",
-	"W|CLEAR_HITAREA_0x40",
-	"W|SET_HITAREA_0x40",
-	"WWW|SET_HITAREA_XY",
+	"W|DEL_BOX",
+	"W|ENABLE_BOX",
+	"W|DISABLE_BOX",
+	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
 	NULL,
-	"IB|UNK_114",
-	"IBJ|HAS_FLAG",
+	"IB|DO_ICONS",
+	"IBJ|IS_CLASS",
 	/* 116 */
-	"IB|SET_FLAG",
-	"IB|CLEAR_FLAG",
+	"IB|SET_CLASS",
+	"IB|UNSET_CLASS",
 	NULL,
 	"W|WAIT_SYNC",
 	/* 120 */
 	"W|SYNC",
-	"BI|SET_VGA_ITEM",
+	"BI|DEF_OBJ",
 	NULL,
 	NULL,
 	/* 124 */
 	NULL,
 	"IJ|IS_SIBLING_WITH_A",
-	"IBB|UNK_126",
-	"WW|PLAY_MUSIC_RESOURCE",
+	"IBB|DO_CLASS_ICONS",
+	"WW|PLAY_TUNE",
 	/* 128 */
-	"W|GET_DUMMY_WORD",
-	"W|GET_WORD_COND_TRUE",
+	"W|WAIT_END_TUNE",
+	"W|IF_END_TUNE",
 	"Bww|SET_ADJ_NOUN",
 	NULL,
 	/* 132 */
@@ -432,12 +432,12 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	"|DUMMYPROC_134",
 	"|QUIT_IF_USER_PRESSES_Y",
 	/* 136 */
-	"IV|GET_ITEM_UNK3",
-	"B|UNK137",
-	"|VGA_POINTER_OP_4",
+	"IV|COPY_SF",
+	"B|RESTORE_ICONS",
+	"|FREEZE_ZONES",
 	"II|SET_PARENT_SPECIAL",
 	/* 140 */
-	"|DEL_TE_AND_ADD_ONE",
+	"|CLEAR_TIMERS",
 	"BI|SET_M1_OR_M3",
 	"WJ|IS_HITAREA_0x40_CLEAR",
 	"I|START_ITEM_SUB",
@@ -465,10 +465,10 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	"B|SET_INK",
 	"BWBW|SETUP_TEXT",
 	"BBTW|PRINT_STR",
-	"W|SOUND_1",
+	"W|PLAY_EFFECT",
 	/* 164 */
-	"|UNK_164",
-	"IWWJ|ITEM_UNK1_UNK2_IS",
+	"|getDollar2",
+	"IWWJ|IS_ADJ_NOUN",
 	"B|SET_BIT2",
 	"B|CLEAR_BIT2",
 	/* 168 */
@@ -480,35 +480,35 @@ static const char *const simon1talkie_opcode_name_table[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"|VGA_POINTER_OP_1",
+	"|LOCK_ZONES",
 	/* 176 */
-	"|VGA_POINTER_OP_2",
-	"BBI|INVENTORY_DESCRIPTION",
-	"WWBB|PATHFIND",
-	"BBB|ROOM_DESCRIPTION",
+	"|UNLOCK_ZONES",
+	"BBI|SCREEN_TEXT_POBJ",
+	"WWBB|GETPATHPOSN",
+	"BBB|SCREEN_TEXT_LONG_TEXT",
 	/* 180 */
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
 	"|LOAD_BEARD",
 	"|UNLOAD_BEARD",
 	/* 184 */
-	"W|CLEAR_VGAPOINTER_ENTRY",
+	"W|UNLOAD_ZONE",
 	"W|LOAD_SOUND_FILES",
-	"|VGA_POINTER_OP_3",
+	"|UNFREEZE_ZONES",
 	"|FADE_TO_BLACK",
 };
 
 static const char *const simon2dos_opcode_name_table[256] = {
 	/* 0 */
-	"|INV_COND",
-	"IJ|PTRA_PARENT_IS",
-	"IJ|PTRA_PARENT_ISNOT",
+	"|NOT",
+	"IJ|AT",
+	"IJ|NOT_AT",
 	NULL,
 	/* 4 */
 	NULL,
-	"IJ|PARENT_IS_1",
-	"IJ|PARENT_ISNOT_1",
-	"IIJ|PARENT_IS",
+	"IJ|CARRIED",
+	"IJ|NOT_CARRIED",
+	"IIJ|IS_AT",
 	/* 8 */
 	NULL,
 	NULL,
@@ -533,9 +533,9 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	NULL,
 	"IJ|IS_ROOM",
 	"IJ|IS_OBJECT",
-	"IWJ|ITEM_UNK3_IS",
+	"IWJ|ITEM_STATE_IS",
 	/* 28 */
-	"IBJ|CHILD_HAS_FLAG",
+	"IBJ|OBJECT_HAS_FLAG",
 	NULL,
 	NULL,
 	"I|SET_NO_PARENT",
@@ -573,20 +573,20 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	"IB|SET_CHILD2_BIT",
 	"IB|CLEAR_CHILD2_BIT",
 	"II|MAKE_SIBLING",
-	"I|INC_UNK3",
+	"I|INC_STATE",
 	/* 60 */
-	"I|DEC_UNK3",
-	"IW|SET_UNK3",
+	"I|DEC_STATE",
+	"IW|SET_STATE",
 	"V|SHOW_INT",
 	"T|SHOW_STRING_NL",
 	/* 64 */
 	"T|SHOW_STRING",
-	"WWWWWB|ADD_HITAREA",
-	"BT|SET_ITEM_NAME",
-	"BT|SET_ITEM_DESC",
+	"WWWWWB|ADD_TEXT_BOX",
+	"BT|SET_SHORT_TEXT",
+	"BT|SET_LONG_TEXT",
 	/* 68 */
-	"x|HALT",
-	"x|RET1",
+	"x|END",
+	"x|DONE",
 	"V|SHOW_STRING_AR3",
 	"W|START_SUB",
 	/* 72 */
@@ -602,66 +602,66 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	/* 80 */
 	"IIJ|IS_ITEM_EQ",
 	NULL,
-	"B|UNK_82",
-	"|RETM10",
+	"B|DEBUG",
+	"|RESCAN",
 	/* 84 */
 	NULL,
 	NULL,
 	NULL,
-	"W|UNK_87",
+	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
 	"|RESTART_ANIMATION",
-	"IB|SET_M_TO_PARENT",
-	"IB|SET_M_TO_SIBLING",
+	"IB|GET_PARENT",
+	"IB|GET_NEXT",
 	/* 92 */
-	"IB|SET_M_TO_CHILD",
+	"IB|GET_CHILDREN",
 	NULL,
 	NULL,
 	NULL,
 	/* 96 */
-	"WB|UNK_96",
+	"WB|PICTURE",
 	"W|LOAD_ZONE",
-	"WWBWWW|START_VGA",
-	"WW|KILL_SPRITE",
+	"WWBWWW|ANIMATE",
+	"WW|STOP_ANIMATE",
 	/* 100 */
-	"|VGA_RESET",
+	"|KILL_ANIMATE",
 	"BWWWWWW|DEFINE_WINDOW",
 	"B|CHANGE_WINDOW",
-	"|UNK_103",
+	"|CLS",
 	/* 104 */
 	"B|CLOSE_WINDOW",
 	NULL,
 	NULL,
-	"WWWWWIW|ADD_ITEM_HITAREA",
+	"WWWWWIW|ADD_BOX",
 	/* 108 */
-	"W|DEL_HITAREA",
-	"W|CLEAR_HITAREA_0x40",
-	"W|SET_HITAREA_0x40",
-	"WWW|SET_HITAREA_XY",
+	"W|DEL_BOX",
+	"W|ENABLE_BOX",
+	"W|DISABLE_BOX",
+	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
 	NULL,
-	"IB|UNK_114",
-	"IBJ|HAS_FLAG",
+	"IB|DO_ICONS",
+	"IBJ|IS_CLASS",
 	/* 116 */
-	"IB|SET_FLAG",
-	"IB|CLEAR_FLAG",
+	"IB|SET_CLASS",
+	"IB|UNSET_CLASS",
 	NULL,
 	"W|WAIT_SYNC",
 	/* 120 */
 	"W|SYNC",
-	"BI|SET_VGA_ITEM",
+	"BI|DEF_OBJ",
 	NULL,
 	NULL,
 	/* 124 */
 	NULL,
 	"IJ|IS_SIBLING_WITH_A",
-	"IBB|UNK_126",
-	"WW|PLAY_MUSIC_RESOURCE",
+	"IBB|DO_CLASS_ICONS",
+	"WW|PLAY_TUNE",
 	/* 128 */
-	"W|GET_DUMMY_WORD",
-	"W|GET_WORD_COND_TRUE",
+	"W|WAIT_END_TUNE",
+	"W|IF_END_TUNE",
 	"Bww|SET_ADJ_NOUN",
 	NULL,
 	/* 132 */
@@ -670,12 +670,12 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	"|DUMMYPROC_134",
 	"|QUIT_IF_USER_PRESSES_Y",
 	/* 136 */
-	"IV|GET_ITEM_UNK3",
-	"B|UNK_137",
-	"|VGA_POINTER_OP_4",
+	"IV|COPY_SF",
+	"B|RESTORE_ICONS",
+	"|FREEZE_ZONES",
 	"II|SET_PARENT_SPECIAL",
 	/* 140 */
-	"|DEL_TE_AND_ADD_ONE",
+	"|CLEAR_TIMERS",
 	"BI|SET_M1_OR_M3",
 	"WJ|IS_HITAREA_0x40_CLEAR",
 	"I|START_ITEM_SUB",
@@ -703,10 +703,10 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	"B|SET_INK",
 	"BWBW|SETUP_TEXT",
 	"BBT|PRINT_STR",
-	"W|SOUND_1",
+	"W|PLAY_EFFECT",
 	/* 164 */
-	"|UNK_164",
-	"IWWJ|ITEM_UNK1_UNK2_IS",
+	"|getDollar2",
+	"IWWJ|IS_ADJ_NOUN",
 	"B|SET_BIT2",
 	"B|CLEAR_BIT2",
 	/* 168 */
@@ -718,21 +718,21 @@ static const char *const simon2dos_opcode_name_table[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"|VGA_POINTER_OP_1",
+	"|LOCK_ZONES",
 	/* 176 */
-	"|VGA_POINTER_OP_2",
-	"BBI|INVENTORY_DESCRIPTION",
-	"WWBB|PATHFIND",
-	"BBB|ROOM_DESCRIPTION",
+	"|UNLOCK_ZONES",
+	"BBI|SCREEN_TEXT_POBJ",
+	"WWBB|GETPATHPOSN",
+	"BBB|SCREEN_TEXT_LONG_TEXT",
 	/* 180 */
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
 	NULL,
 	NULL,
 	/* 184 */
-	"W|CLEAR_VGAPOINTER_ENTRY",
+	"W|UNLOAD_ZONE",
 	NULL,
-	"|VGA_POINTER_OP_3",
+	"|UNFREEZE_ZONES",
 	NULL,
 	/* 188 */
 	"BSJ|STRING2_IS",
@@ -742,15 +742,15 @@ static const char *const simon2dos_opcode_name_table[256] = {
 
 static const char *const simon2talkie_opcode_name_table[256] = {
 	/* 0 */
-	"|INV_COND",
-	"IJ|PTRA_PARENT_IS",
-	"IJ|PTRA_PARENT_ISNOT",
+	"|NOT",
+	"IJ|AT",
+	"IJ|NOT_AT",
 	NULL,
 	/* 4 */
 	NULL,
-	"IJ|PARENT_IS_1",
-	"IJ|PARENT_ISNOT_1",
-	"IIJ|PARENT_IS",
+	"IJ|CARRIED",
+	"IJ|NOT_CARRIED",
+	"IIJ|IS_AT",
 	/* 8 */
 	NULL,
 	NULL,
@@ -775,9 +775,9 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	NULL,
 	"IJ|IS_ROOM",
 	"IJ|IS_OBJECT",
-	"IWJ|ITEM_UNK3_IS",
+	"IWJ|ITEM_STATE_IS",
 	/* 28 */
-	"IBJ|CHILD_HAS_FLAG",
+	"IBJ|OBJECT_HAS_FLAG",
 	NULL,
 	NULL,
 	"I|SET_NO_PARENT",
@@ -815,20 +815,20 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	"IB|SET_CHILD2_BIT",
 	"IB|CLEAR_CHILD2_BIT",
 	"II|MAKE_SIBLING",
-	"I|INC_UNK3",
+	"I|INC_STATE",
 	/* 60 */
-	"I|DEC_UNK3",
-	"IW|SET_UNK3",
+	"I|DEC_STATE",
+	"IW|SET_STATE",
 	"V|SHOW_INT",
 	"T|SHOW_STRING_NL",
 	/* 64 */
 	"T|SHOW_STRING",
-	"WWWWWB|ADD_HITAREA",
-	"BT|SET_ITEM_NAME",
-	"BTw|SET_ITEM_DESC",
+	"WWWWWB|ADD_TEXT_BOX",
+	"BT|SET_SHORT_TEXT",
+	"BTw|SET_LONG_TEXT",
 	/* 68 */
-	"x|HALT",
-	"x|RET1",
+	"x|END",
+	"x|DONE",
 	"V|SHOW_STRING_AR3",
 	"W|START_SUB",
 	/* 72 */
@@ -844,66 +844,66 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	/* 80 */
 	"IIJ|IS_ITEM_EQ",
 	NULL,
-	"B|UNK_82",
-	"|RETM10",
+	"B|DEBUG",
+	"|RESCAN",
 	/* 84 */
 	NULL,
 	NULL,
 	NULL,
-	"W|UNK_87",
+	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
 	"|RESTART_ANIMATION",
-	"IB|SET_M_TO_PARENT",
-	"IB|SET_M_TO_SIBLING",
+	"IB|GET_PARENT",
+	"IB|GET_NEXT",
 	/* 92 */
-	"IB|SET_M_TO_CHILD",
+	"IB|GET_CHILDREN",
 	NULL,
 	NULL,
 	NULL,
 	/* 96 */
-	"WB|UNK_96",
+	"WB|PICTURE",
 	"W|LOAD_ZONE",
-	"WWBWWW|START_VGA",
-	"WW|KILL_SPRITE",
+	"WWBWWW|ANIMATE",
+	"WW|STOP_ANIMATE",
 	/* 100 */
-	"|VGA_RESET",
+	"|KILL_ANIMATE",
 	"BWWWWWW|DEFINE_WINDOW",
 	"B|CHANGE_WINDOW",
-	"|UNK_103",
+	"|CLS",
 	/* 104 */
 	"B|CLOSE_WINDOW",
 	NULL,
 	NULL,
-	"WWWWWIW|ADD_ITEM_HITAREA",
+	"WWWWWIW|ADD_BOX",
 	/* 108 */
-	"W|DEL_HITAREA",
-	"W|CLEAR_HITAREA_0x40",
-	"W|SET_HITAREA_0x40",
-	"WWW|SET_HITAREA_XY",
+	"W|DEL_BOX",
+	"W|ENABLE_BOX",
+	"W|DISABLE_BOX",
+	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
 	NULL,
-	"IB|UNK_114",
-	"IBJ|HAS_FLAG",
+	"IB|DO_ICONS",
+	"IBJ|IS_CLASS",
 	/* 116 */
-	"IB|SET_FLAG",
-	"IB|CLEAR_FLAG",
+	"IB|SET_CLASS",
+	"IB|UNSET_CLASS",
 	NULL,
 	"W|WAIT_SYNC",
 	/* 120 */
 	"W|SYNC",
-	"BI|SET_VGA_ITEM",
+	"BI|DEF_OBJ",
 	NULL,
 	NULL,
 	/* 124 */
 	NULL,
 	"IJ|IS_SIBLING_WITH_A",
-	"IBB|UNK_126",
-	"WW|PLAY_MUSIC_RESOURCE",
+	"IBB|DO_CLASS_ICONS",
+	"WW|PLAY_TUNE",
 	/* 128 */
-	"W|GET_DUMMY_WORD",
-	"W|GET_WORD_COND_TRUE",
+	"W|WAIT_END_TUNE",
+	"W|IF_END_TUNE",
 	"Bww|SET_ADJ_NOUN",
 	NULL,
 	/* 132 */
@@ -912,12 +912,12 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	"|DUMMYPROC_134",
 	"|QUIT_IF_USER_PRESSES_Y",
 	/* 136 */
-	"IV|GET_ITEM_UNK3",
-	"B|UNK_137",
-	"|VGA_POINTER_OP_4",
+	"IV|COPY_SF",
+	"B|RESTORE_ICONS",
+	"|FREEZE_ZONES",
 	"II|SET_PARENT_SPECIAL",
 	/* 140 */
-	"|DEL_TE_AND_ADD_ONE",
+	"|CLEAR_TIMERS",
 	"BI|SET_M1_OR_M3",
 	"WJ|IS_HITAREA_0x40_CLEAR",
 	"I|START_ITEM_SUB",
@@ -945,10 +945,10 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	"B|SET_INK",
 	"BWBW|SETUP_TEXT",
 	"BBTW|PRINT_STR",
-	"W|SOUND_1",
+	"W|PLAY_EFFECT",
 	/* 164 */
-	"|UNK_164",
-	"IWWJ|ITEM_UNK1_UNK2_IS",
+	"|getDollar2",
+	"IWWJ|IS_ADJ_NOUN",
 	"B|SET_BIT2",
 	"B|CLEAR_BIT2",
 	/* 168 */
@@ -960,21 +960,21 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 	NULL,
 	NULL,
 	NULL,
-	"|VGA_POINTER_OP_1",
+	"|LOCK_ZONES",
 	/* 176 */
-	"|VGA_POINTER_OP_2",
-	"BBI|INVENTORY_DESCRIPTION",
-	"WWBB|PATHFIND",
-	"BBB|ROOM_DESCRIPTION",
+	"|UNLOCK_ZONES",
+	"BBI|SCREEN_TEXT_POBJ",
+	"WWBB|GETPATHPOSN",
+	"BBB|SCREEN_TEXT_LONG_TEXT",
 	/* 180 */
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
 	NULL,
 	NULL,
 	/* 184 */
-	"W|CLEAR_VGAPOINTER_ENTRY",
+	"W|UNLOAD_ZONE",
 	NULL,
-	"|VGA_POINTER_OP_3",
+	"|UNFREEZE_ZONES",
 	NULL,
 	/* 188 */
 	"BSJ|STRING2_IS",
@@ -984,15 +984,15 @@ static const char *const simon2talkie_opcode_name_table[256] = {
 
 static const char *const feeblefiles_opcode_name_table[256] = {
 	/* 0 */
-	"|INV_COND",
-	"IJ|PTRA_PARENT_IS",
-	"IJ|PTRA_PARENT_ISNOT",
+	"|NOT",
+	"IJ|AT",
+	"IJ|NOT_AT",
 	NULL,
 	/* 4 */
 	NULL,
-	"IJ|PARENT_IS_1",
-	"IJ|PARENT_ISNOT_1",
-	"IIJ|PARENT_IS",
+	"IJ|CARRIED",
+	"IJ|NOT_CARRIED",
+	"IIJ|IS_AT",
 	/* 8 */
 	NULL,
 	NULL,
@@ -1017,9 +1017,9 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	NULL,
 	"IJ|IS_ROOM",
 	"IJ|IS_OBJECT",
-	"IWJ|ITEM_UNK3_IS",
+	"IWJ|ITEM_STATE_IS",
 	/* 28 */
-	"IBJ|CHILD_HAS_FLAG",
+	"IBJ|OBJECT_HAS_FLAG",
 	NULL,
 	NULL,
 	"I|SET_NO_PARENT",
@@ -1057,20 +1057,20 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	"IB|SET_CHILD2_BIT",
 	"IB|CLEAR_CHILD2_BIT",
 	"II|MAKE_SIBLING",
-	"I|INC_UNK3",
+	"I|INC_STATE",
 	/* 60 */
-	"I|DEC_UNK3",
-	"IW|SET_UNK3",
+	"I|DEC_STATE",
+	"IW|SET_STATE",
 	"V|SHOW_INT",
 	"T|SHOW_STRING_NL",
 	/* 64 */
 	"T|SHOW_STRING",
-	"WWWWWB|ADD_HITAREA",
-	"BT|SET_ITEM_NAME",
-	"BTw|SET_ITEM_DESC",
+	"WWWWWB|ADD_TEXT_BOX",
+	"BT|SET_SHORT_TEXT",
+	"BTw|SET_LONG_TEXT",
 	/* 68 */
-	"x|HALT",
-	"x|RET1",
+	"x|END",
+	"x|DONE",
 	"V|SHOW_STRING_AR3",
 	"W|START_SUB",
 	/* 72 */
@@ -1086,66 +1086,66 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	/* 80 */
 	"IIJ|IS_ITEM_EQ",
 	NULL,
-	"B|UNK_82",
-	"|RETM10",
+	"B|DEBUG",
+	"|RESCAN",
 	/* 84 */
 	NULL,
 	NULL,
 	NULL,
-	"W|UNK_87",
+	"W|COMMENT",
 	/* 88 */
 	"|STOP_ANIMATION",
 	"|RESTART_ANIMATION",
-	"IB|SET_M_TO_PARENT",
-	"IB|SET_M_TO_SIBLING",
+	"IB|GET_PARENT",
+	"IB|GET_NEXT",
 	/* 92 */
-	"IB|SET_M_TO_CHILD",
+	"IB|GET_CHILDREN",
 	NULL,
 	NULL,
 	NULL,
 	/* 96 */
-	"WB|UNK_96",
+	"WB|PICTURE",
 	"W|LOAD_ZONE",
-	"WWBWWW|START_VGA",
-	"WW|KILL_SPRITE",
+	"WWBWWW|ANIMATE",
+	"WW|STOP_ANIMATE",
 	/* 100 */
-	"|VGA_RESET",
+	"|KILL_ANIMATE",
 	"BWWWWWW|DEFINE_WINDOW",
 	"B|CHANGE_WINDOW",
-	"|UNK_103",
+	"|CLS",
 	/* 104 */
 	"B|CLOSE_WINDOW",
 	NULL,
 	NULL,
-	"WWWWWIW|ADD_ITEM_HITAREA",
+	"WWWWWIW|ADD_BOX",
 	/* 108 */
-	"W|DEL_HITAREA",
-	"W|CLEAR_HITAREA_0x40",
-	"W|SET_HITAREA_0x40",
-	"WWW|SET_HITAREA_XY",
+	"W|DEL_BOX",
+	"W|ENABLE_BOX",
+	"W|DISABLE_BOX",
+	"WWW|MOVE_BOX",
 	/* 112 */
 	NULL,
 	NULL,
-	"IB|UNK_114",
-	"IBJ|HAS_FLAG",
+	"IB|DO_ICONS",
+	"IBJ|IS_CLASS",
 	/* 116 */
-	"IB|SET_FLAG",
-	"IB|CLEAR_FLAG",
+	"IB|SET_CLASS",
+	"IB|UNSET_CLASS",
 	NULL,
 	"W|WAIT_SYNC",
 	/* 120 */
 	"W|SYNC",
-	"BI|SET_VGA_ITEM",
+	"BI|DEF_OBJ",
 	"|ORACLE_TEXT_DOWN",
 	"|ORACLE_TEXT_UP",
 	/* 124 */
 	"WJ|IF_TIME",
 	"IJ|IS_SIBLING_WITH_A",
-	"IBB|UNK_126",
-	"WW|PLAY_MUSIC_RESOURCE",
+	"IBB|DO_CLASS_ICONS",
+	"WW|PLAY_TUNE",
 	/* 128 */
-	"W|GET_DUMMY_WORD",
-	"W|GET_WORD_COND_TRUE",
+	"W|WAIT_END_TUNE",
+	"W|IF_END_TUNE",
 	"Bww|SET_ADJ_NOUN",
 	"|SET_TIME",
 	/* 132 */
@@ -1154,12 +1154,12 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	"|LIST_SAVED_GAMES",
 	"|SWITCH_CD",
 	/* 136 */
-	"IV|GET_ITEM_UNK3",
-	"B|UNK_137",
-	"|VGA_POINTER_OP_4",
+	"IV|COPY_SF",
+	"B|RESTORE_ICONS",
+	"|FREEZE_ZONES",
 	"II|SET_PARENT_SPECIAL",
 	/* 140 */
-	"|DEL_TE_AND_ADD_ONE",
+	"|CLEAR_TIMERS",
 	"BI|SET_M1_OR_M3",
 	"WJ|IS_HITAREA_0x40_CLEAR",
 	"I|START_ITEM_SUB",
@@ -1187,10 +1187,10 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	"B|SET_INK",
 	"BWWW|SETUP_TEXT",
 	"BBTW|PRINT_STR",
-	"W|SOUND_1",
+	"W|PLAY_EFFECT",
 	/* 164 */
-	"|UNK_164",
-	"IWWJ|ITEM_UNK1_UNK2_IS",
+	"|getDollar2",
+	"IWWJ|IS_ADJ_NOUN",
 	"B|SET_BIT2",
 	"B|CLEAR_BIT2",
 	/* 168 */
@@ -1202,21 +1202,21 @@ static const char *const feeblefiles_opcode_name_table[256] = {
 	"|HYPERLINK_OFF",
 	"|CHECK_PATHS",
 	NULL,
-	"|VGA_POINTER_OP_1",
+	"|LOCK_ZONES",
 	/* 176 */
-	"|VGA_POINTER_OP_2",
-	"BBI|INVENTORY_DESCRIPTION",
-	"WWBB|PATHFIND",
-	"BBB|ROOM_DESCRIPTION",
+	"|UNLOCK_ZONES",
+	"BBI|SCREEN_TEXT_POBJ",
+	"WWBB|GETPATHPOSN",
+	"BBB|SCREEN_TEXT_LONG_TEXT",
 	/* 180 */
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
 	"T|LOAD_VIDEO",
 	"|PLAY_VIDEO",
 	/* 184 */
-	"W|CLEAR_VGAPOINTER_ENTRY",
+	"W|UNLOAD_ZONE",
 	NULL,
-	"|VGA_POINTER_OP_3",
+	"|UNFREEZE_ZONES",
 	"|CENTRE_SCROLL",
 	/* 188 */
 	"BSJ|STRING2_IS",
@@ -1262,25 +1262,25 @@ const char *const simon1_video_opcode_name_table[] = {
 	"i|JUMP_REL",
 	"|CHAIN_TO",
 	/* 20 */
-	"dd|SET_CODE_WORD",
-	"i|JUMP_IF_CODE_WORD",
-	"dd|SET_SPRITE_PALETTE",
-	"d|SET_SPRITE_PRIORITY",
+	"dd|SET_REPEAT",
+	"i|END_REPEAT",
+	"dd|SET_PALETTE",
+	"d|SET_PRIORITY",
 	/* 24 */
 	"diid|SET_SPRITE_XY",
 	"x|HALT_SPRITE",
 	"ddddd|SET_WINDOW",
 	"|RESET",
 	/* 28 */
-	"dddd|DUMMY_28",
+	"dddd|PLAY_SOUND",
 	"|STOP_ALL_SOUNDS",
-	"d|SET_BASE_DELAY",
-	"d|SET_PALETTE_MODE",
+	"d|SET_FRAME_RATE",
+	"d|SET_WINDOW",
 	/* 32 */
 	"vv|COPY_VAR",
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
-	"dd|VC35",
+	"dd|CLEAR_WINDOW",
 	/* 36 */
 	"dd|SAVELOAD_THING",
 	"v|SET_SPRITE_OFFSET_Y",
@@ -1297,23 +1297,23 @@ const char *const simon1_video_opcode_name_table[] = {
 	"v|SET_SPRITE_Y",
 	"vv|ADD_VAR_F",
 	/* 48 */
-	"|VC_48",
+	"|COMPUTE_YOFS",
 	"d|SET_BIT",
 	"d|CLEAR_BIT",
-	"d|CLEAR_HITAREA_BIT_0x40",
+	"d|ENABLE_BOX",
 	/* 52 */
-	"d|PLAY_SOUND",
+	"d|PLAY_EFFECT",
 	"dd|DUMMY_53",
 	"ddd|DUMMY_54",
-	"ddd|OFFSET_HIT_AREA",
+	"ddd|MOVE_BOX",
 	/* 56 */
 	"|DUMMY_56",
-	"|DUMMY_57",
-	"|UNK_58",
-	"|SKIP_IF_SPEECH_ENDED",
+	"|BLACK_PALETTE",
+	"|SET_PRIORITIES",
+	"|SKIP_IF_VOICE",
 	/* 60 */
-	"d|KILL_SPRITE",
-	"ddd|INIT_SPRITE",
+	"d|STOP_ANIMATE",
+	"ddd|MASK",
 	"|FASTFADEOUT",
 	"|FASTFADEIN",
 };
@@ -1345,25 +1345,25 @@ const char *const simon2_video_opcode_name_table[] = {
 	"i|JUMP_REL",
 	"|CHAIN_TO",
 	/* 20 */
-	"dd|SET_CODE_WORD",
-	"i|JUMP_IF_CODE_WORD",
-	"dd|SET_SPRITE_PALETTE",
-	"d|SET_SPRITE_PRIORITY",
+	"dd|SET_REPEAT",
+	"i|END_REPEAT",
+	"dd|SET_PALETTE",
+	"d|SET_PRIORITY",
 	/* 24 */
 	"diib|SET_SPRITE_XY",
 	"x|HALT_SPRITE",
 	"ddddd|SET_WINDOW",
 	"|RESET",
 	/* 28 */
-	"dddd|DUMMY_28",
+	"dddd|PLAY_SOUND",
 	"|STOP_ALL_SOUNDS",
-	"d|SET_BASE_DELAY",
-	"d|SET_PALETTE_MODE",
+	"d|SET_FRAME_RATE",
+	"d|SET_WINDOW",
 	/* 32 */
 	"vv|COPY_VAR",
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
-	"dd|VC35",
+	"dd|CLEAR_WINDOW",
 	/* 36 */
 	"dd|SAVELOAD_THING",
 	"v|SET_SPRITE_OFFSET_Y",
@@ -1380,27 +1380,27 @@ const char *const simon2_video_opcode_name_table[] = {
 	"v|SET_SPRITE_Y",
 	"vv|ADD_VAR_F",
 	/* 48 */
-	"|VC_48",
+	"|COMPUTE_YOFS",
 	"d|SET_BIT",
 	"d|CLEAR_BIT",
-	"d|CLEAR_HITAREA_BIT_0x40",
+	"d|ENABLE_BOX",
 	/* 52 */
-	"d|PLAY_SOUND",
+	"d|PLAY_EFFECT",
 	"dd|DUMMY_53",
 	"ddd|DUMMY_54",
-	"ddd|OFFSET_HIT_AREA",
+	"ddd|MOVE_BOX",
 	/* 56 */
-	"i|SLEEP_EX",
-	"|DUMMY_57",
-	"|UNK_58",
-	"ddd|KILL_MULTI_SPRITE",
+	"i|WAIT_BIG",
+	"|BLACK_PALETTE",
+	"|SET_PRIORITIES",
+	"ddd|STOP_ANIMATIONS",
 	/* 60 */
-	"dd|KILL_SPRITE",
-	"ddd|INIT_SPRITE",
+	"dd|STOP_ANIMATE",
+	"ddd|MASK",
 	"|FASTFADEOUT",
 	"|FASTFADEIN",
 	/* 64 */
-	"|SKIP_IF_SPEECH_ENDED",
+	"|SKIP_IF_VOICE",
 	"|SLOW_FADE_IN",
 	"|SKIP_IF_NZ",
 	"|SKIP_IF_GE",
@@ -1442,25 +1442,25 @@ const char *const feeblefiles_video_opcode_name_table[] = {
 	"i|JUMP_REL",
 	"|CHAIN_TO",
 	/* 20 */
-	"dd|SET_CODE_WORD",
-	"i|JUMP_IF_CODE_WORD",
-	"dd|SET_SPRITE_PALETTE",
-	"d|SET_SPRITE_PRIORITY",
+	"dd|SET_REPEAT",
+	"i|END_REPEAT",
+	"dd|SET_PALETTE",
+	"d|SET_PRIORITY",
 	/* 24 */
 	"diib|SET_SPRITE_XY",
 	"x|HALT_SPRITE",
 	"ddddd|SET_WINDOW",
 	"|RESET",
 	/* 28 */
-	"dddd|DUMMY_28",
+	"dddd|PLAY_SOUND",
 	"|STOP_ALL_SOUNDS",
-	"d|SET_BASE_DELAY",
-	"d|SET_PALETTE_MODE",
+	"d|SET_FRAME_RATE",
+	"d|SET_WINDOW",
 	/* 32 */
 	"vv|COPY_VAR",
 	"|MOUSE_ON",
 	"|MOUSE_OFF",
-	"dd|VC35",
+	"dd|CLEAR_WINDOW",
 	/* 36 */
 	"dd|SAVELOAD_THING",
 	"v|SET_SPRITE_OFFSET_Y",
@@ -1477,27 +1477,27 @@ const char *const feeblefiles_video_opcode_name_table[] = {
 	"v|SET_SPRITE_Y",
 	"vv|ADD_VAR_F",
 	/* 48 */
-	"|VC_48",
+	"|COMPUTE_YOFS",
 	"d|SET_BIT",
 	"d|CLEAR_BIT",
-	"d|CLEAR_HITAREA_BIT_0x40",
+	"d|ENABLE_BOX",
 	/* 52 */
-	"ddd|PLAY_SOUND",
-	"ddd|PLAY_SOUND_WITH_ANIM",
+	"ddd|PLAY_EFFECT",
+	"ddd|PAN_SFX",
 	"ddd|DUMMY_54",
-	"ddd|OFFSET_HIT_AREA",
+	"ddd|MOVE_BOX",
 	/* 56 */
-	"i|SLEEP_EX",
-	"|DUMMY_57",
-	"|UNK_58",
-	"ddd|KILL_MULTI_SPRITE",
+	"i|WAIT_BIG",
+	"|BLACK_PALETTE",
+	"|SET_PRIORITIES",
+	"ddd|STOP_ANIMATIONS",
 	/* 60 */
-	"dd|KILL_SPRITE",
-	"ddd|INIT_SPRITE",
+	"dd|STOP_ANIMATE",
+	"ddd|MASK",
 	"|FASTFADEOUT",
 	"|FASTFADEIN",
 	/* 64 */
-	"|SKIP_IF_SPEECH_ENDED",
+	"|SKIP_IF_VOICE",
 	"|SLOW_FADE_IN",
 	"|SKIP_IF_NZ",
 	"|SKIP_IF_GE",