aboutsummaryrefslogtreecommitdiff
path: root/simon
diff options
context:
space:
mode:
Diffstat (limited to 'simon')
-rw-r--r--simon/debug.h48
-rw-r--r--simon/simon.h12
-rw-r--r--simon/vga.cpp24
3 files changed, 42 insertions, 42 deletions
diff --git a/simon/debug.h b/simon/debug.h
index 027a4dfef7..9e2eac974a 100644
--- a/simon/debug.h
+++ b/simon/debug.h
@@ -980,11 +980,11 @@ static const char *const simon2talkie_opcode_name_table[256] = {
const char *const simon1_video_opcode_name_table[] = {
/* 0 */
"x|RET",
- "ddd|DUMMY",
+ "ddd|DUMMY1",
"d|CALL",
"ddddd|NEW_THREAD",
/* 4 */
- "ddd|DUMMY_2",
+ "ddd|DUMMY4",
"vd|SKIP_IF_NEQ",
"d|SKIP_IFN_SIB_WITH_A",
"d|SKIP_IF_SIB_WITH_A",
@@ -1022,7 +1022,7 @@ const char *const simon1_video_opcode_name_table[] = {
"vv|COPY_VAR",
"|FORCE_UNLOCK",
"|FORCE_LOCK",
- "dd|DUMMY_4",
+ "dd|VC35",
/* 36 */
"dd|SAVELOAD_THING",
"v|OFFSET_Y_F",
@@ -1044,15 +1044,15 @@ const char *const simon1_video_opcode_name_table[] = {
"d|CLEAR_BIT",
"d|CLEAR_HITAREA_BIT_0x40",
/* 52 */
- "d|VC_52",
- "dd|DUMMY_5",
- "ddd|DUMMY_6",
+ "d|PLAY_SOUND",
+ "dd|DUMMY53",
+ "ddd|DUMMY54",
"ddd|OFFSET_HIT_AREA",
/* 56 */
- "|DUMMY_7",
- "|DUMMY_8",
+ "|DUMMY57",
+ "|UNK58",
"|DUMMY_9",
- "|SKIP_IF_SOUND??",
+ "|SKIP_IF_SPEECH",
/* 60 */
"d|KILL_THREAD",
"ddd|INIT_SPRITE",
@@ -1064,11 +1064,11 @@ const char *const simon1_video_opcode_name_table[] = {
const char *const simon2_video_opcode_name_table[] = {
/* 0 */
"x|RET",
- "ddd|DUMMY",
+ "ddd|DUMMY1",
"d|CALL",
"ddddd|NEW_THREAD",
/* 4 */
- "ddd|DUMMY_2",
+ "ddd|DUMMY4",
"vd|SKIP_IF_NEQ",
"d|SKIP_IFN_SIB_WITH_A",
"d|SKIP_IF_SIB_WITH_A",
@@ -1106,7 +1106,7 @@ const char *const simon2_video_opcode_name_table[] = {
"vv|COPY_VAR",
"|FORCE_UNLOCK",
"|FORCE_LOCK",
- "dd|DUMMY_4",
+ "dd|VC35",
/* 36 */
"dd|SAVELOAD_THING",
"v|OFFSET_Y_F",
@@ -1128,14 +1128,14 @@ const char *const simon2_video_opcode_name_table[] = {
"d|CLEAR_BIT",
"d|CLEAR_HITAREA_BIT_0x40",
/* 52 */
- "d|VC_52",
- "dd|DUMMY_5",
- "ddd|DUMMY_6",
+ "d|PLAY_SOUND",
+ "dd|DUMMY53",
+ "ddd|DUMMY54",
"ddd|OFFSET_HIT_AREA",
/* 56 */
"i|SLEEP_EX",
- "|DUMMY_8",
- "|DUMMY_9",
+ "|DUMMY_57",
+ "|UNK58",
"ddd|KILL_MULTI_THREAD",
/* 60 */
"dd|KILL_THREAD",
@@ -1143,18 +1143,18 @@ const char *const simon2_video_opcode_name_table[] = {
"|PALETTE_THING",
"|PALETTE_THING_2",
/* 64 */
- "|UNK64",
- "|UNK65",
- "|UNK66",
- "|UNK67",
+ "|SKIP_IF_SPEECH",
+ "|PALETTE_THING_3",
+ "|SKIP_IF_NZ",
+ "|SKIP_IF_GE",
/* 68 */
- "|UNK68",
+ "|SKIP_IF_LE",
"dd|UNK69",
"dd|UNK70",
"|UNK71",
/* 72 */
"dd|UNK72",
- "bb|UNK73",
- "bb|UNK74",
+ "bb|SET_OP189_FLAG",
+ "bb|CLEAR_OP189_FLAG",
};
diff --git a/simon/simon.h b/simon/simon.h
index 58caa6ac5d..b9cc8003d4 100644
--- a/simon/simon.h
+++ b/simon/simon.h
@@ -640,7 +640,7 @@ public:
void vc_49_set_bit();
void vc_50_clear_bit();
void vc_51_clear_hitarea_bit_0x40();
- void vc_52();
+ void vc_52_play_sound();
void vc_53_no_op();
void vc_54_no_op();
void vc_55_offset_hit_area();
@@ -653,11 +653,11 @@ public:
void vc_63_palette_thing_2();
// Simon2 specific Video Script Opcodes
- void vc_64();
- void vc_65();
- void vc_66_nz();
- void vc_67_ge();
- void vc_68_le();
+ void vc_64_skip_if_speech();
+ void vc_65_palette_thing_3();
+ void vc_66_skip_if_nz();
+ void vc_67_skip_if_ge();
+ void vc_68_skip_if_le();
void vc_69();
void vc_70();
void vc_71();
diff --git a/simon/vga.cpp b/simon/vga.cpp
index b866fcbb97..a940256246 100644
--- a/simon/vga.cpp
+++ b/simon/vga.cpp
@@ -82,7 +82,7 @@ static const VgaOpcodeProc vga_opcode_table[] = {
&SimonState::vc_49_set_bit,
&SimonState::vc_50_clear_bit,
&SimonState::vc_51_clear_hitarea_bit_0x40,
- &SimonState::vc_52,
+ &SimonState::vc_52_play_sound,
&SimonState::vc_53_no_op,
&SimonState::vc_54_no_op,
&SimonState::vc_55_offset_hit_area,
@@ -94,11 +94,11 @@ static const VgaOpcodeProc vga_opcode_table[] = {
&SimonState::vc_61_sprite_change,
&SimonState::vc_62_palette_thing,
&SimonState::vc_63_palette_thing_2,
- &SimonState::vc_64,
- &SimonState::vc_65,
- &SimonState::vc_66_nz,
- &SimonState::vc_67_ge,
- &SimonState::vc_68_le,
+ &SimonState::vc_64_skip_if_speech,
+ &SimonState::vc_65_palette_thing_3,
+ &SimonState::vc_66_skip_if_nz,
+ &SimonState::vc_67_skip_if_ge,
+ &SimonState::vc_68_skip_if_le,
&SimonState::vc_69,
&SimonState::vc_70,
&SimonState::vc_71,
@@ -1596,7 +1596,7 @@ void SimonState::vc_51_clear_hitarea_bit_0x40()
clear_hitarea_bit_0x40(vc_read_next_word());
}
-void SimonState::vc_52()
+void SimonState::vc_52_play_sound()
{
uint16 a = vc_read_next_word();
@@ -1851,13 +1851,13 @@ void SimonState::vc_63_palette_thing_2()
_video_var_3 = false;
}
-void SimonState::vc_64()
+void SimonState::vc_64_skip_if_speech()
{ // Simon2
if (vc_59_helper())
vc_skip_next_instruction();
}
-void SimonState::vc_65()
+void SimonState::vc_65_palette_thing_3()
{ // Simon2
_palette_color_count = 0x270;
_video_num_pal_colors = 0x0D0;
@@ -1869,7 +1869,7 @@ void SimonState::vc_65()
_video_var_3 = false;
}
-void SimonState::vc_66_nz()
+void SimonState::vc_66_skip_if_nz()
{ // Simon2
uint a = vc_read_next_word();
uint b = vc_read_next_word();
@@ -1878,7 +1878,7 @@ void SimonState::vc_66_nz()
vc_skip_next_instruction();
}
-void SimonState::vc_67_ge()
+void SimonState::vc_67_skip_if_ge()
{ // Simon2
uint a = vc_read_next_word();
uint b = vc_read_next_word();
@@ -1887,7 +1887,7 @@ void SimonState::vc_67_ge()
vc_skip_next_instruction();
}
-void SimonState::vc_68_le()
+void SimonState::vc_68_skip_if_le()
{ // Simon2
uint a = vc_read_next_word();
uint b = vc_read_next_word();
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-21 13:06:24 +0000