# HG changeset patch # User Michael Pavone # Date 1489472053 25200 # Node ID 996eb76d6da14e8a75fad22aac3e22c7f115453c # Parent 34d3cb05014de9f4a02524c59323a0ba7998a282 RESET is not a terminal instruction on the 68K. Fixes a crash bug in Chavez II and possibly other games diff -r 34d3cb05014d -r 996eb76d6da1 m68k_core.c --- a/m68k_core.c Mon Mar 13 23:13:24 2017 -0700 +++ b/m68k_core.c Mon Mar 13 23:14:13 2017 -0700 @@ -681,7 +681,7 @@ uint8_t m68k_is_terminal(m68kinst * inst) { return inst->op == M68K_RTS || inst->op == M68K_RTE || inst->op == M68K_RTR || inst->op == M68K_JMP - || inst->op == M68K_TRAP || inst->op == M68K_ILLEGAL || inst->op == M68K_INVALID || inst->op == M68K_RESET + || inst->op == M68K_TRAP || inst->op == M68K_ILLEGAL || inst->op == M68K_INVALID || (inst->op == M68K_BCC && inst->extra.cond == COND_TRUE); }