diff --git a/src/mame/drivers/toaplan2.c b/src/mame/drivers/toaplan2.c
index 63805da1a89..734ba75c970 100644
--- a/src/mame/drivers/toaplan2.c
+++ b/src/mame/drivers/toaplan2.c
@@ -261,9 +261,9 @@ To Do / Unknowns:
 #include "sound/ymz280b.h"
 #include "includes/toaplan2.h"
 #include "rendlay.h"
-/*
+
 #define USE_ENCRYPTED_V25S
-*/
+
 
 static MACHINE_RESET(batsugun);
 static READ16_HANDLER( batsugun_share_r );
@@ -3428,8 +3428,8 @@ static const UINT8 ts002mach_decryption_table[256] = {
 	                                                             /*x*/
 	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0xbc, 0x98,0x99,0x9a,0x9b,0x9c,0xc6,0x9e,0x9f, /* 90 */
 	                                   /*x*/                          /*x*/
-	0xa0,0xa1,0xa2,0x8c,0xa4,0xa5,0xa6,0xa7, 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf, /* a0 */
-	               /*x*/
+	0xa0,0xa1,0xfc,0x8c,0xa4,0xa5,0xa6,0xa7, 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf, /* a0 */
+	          /*?*//*x*/
 	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7, 0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0xbf, /* b0 */
 	0xc0,0xc1,0xc2,0xc3,0xc4,0x36,0xc6,0xc7, 0xc8,0xc9,0xc6,0xea,0xcc,0xcd,0xce,0xcf, /* c0 */
 	                         /*x*/                     /*x*//*x*/
@@ -3499,35 +3499,37 @@ MACHINE_CONFIG_END
   - they seem to have mostly mapped extra opcodes for common ones, eg. mov
 */
 static const UINT8 ts004dash_decryption_table[256] = {
-	0x00,0x01,0x02,0x03,0x8c,0x05,0x06,0x07, 0x08,0x09,0x36,0x0b,0x0c,0x0d,0x8c,0x0f, /* 00 */
-	                    /*?*/                          /*?*/               /*?*/
+	0x00,0x01,0x02,0x03,0x8c,0x06,0x06,0x07, 0x08,0x09,0x36,0x0b,0x0c,0x0d,0x8c,0xe9, /* 00 */
+	                    /*r*//*r*/                     /*x*/               /*r*//*r*/
 	0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17, 0x18,0x19,0x1a,0x1b,0x1c,0x1d,0x8e,0x1f, /* 10 */
 	                                                                       /*x*/
-	0x20,0x21,0x22,0x23,0x36,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x2f, /* 20 */
-	                    /*?*/
-	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37, 0x38,0x39,0x3a,0x3b,0x3c,0x3d,0x3e,0x3f, /* 30 */
-	0x40,0x41,0x42,0x43,0x44,0xb8,0x46,0x47, 0x48,0x49,0x4a,0x4b,0x4c,0x4d,0x4e,0x4f, /* 40 */
-                             /*x*/
-	0x50,0x51,0x52,0xfc,0x54,0x55,0x56,0x57, 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f, /* 50 */
-	               /*!*/
+	0x20,0x21,0x22,0x23,0x36,0x25,0x26,0x27, 0x28,0x29,0x2a,0x2b,0x2c,0x2d,0x2e,0x80, /* 20 */
+	                    /*x*/                                                   /*r*/
+	0x30,0x31,0x32,0x33,0x34,0x35,0x36,0xeb, 0x38,0x39,0x3a,0x3b,0x3c,0xe8,0x3e,0x3f, /* 30 */
+	                                   /*r*/                               /*r*/
+	0x40,0x41,0x42,0x43,0x44,0xb8,0x46,0x47, 0x48,0x49,0x4a,0x4b,0xab,0x4d,0x4e,0x4f, /* 40 */
+	                         /*x*/                               /*r*/
+	0x50,0x51,0x52,0xbd,0x54,0x55,0x56,0x57, 0x58,0x59,0x5a,0x5b,0x5c,0x5d,0x5e,0x5f, /* 50 */
+	               /*r*/                     /*r*/
 	0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67, 0x68,0x69,0x6a,0x6b,0x6c,0x6d,0x6e,0x6f, /* 60 */
-	0x70,0x71,0x8c,0x73,0x74,0x75,0x76,0x77, 0x78,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f, /* 70 */
-	          /*?*/
+	0x70,0x71,0x8c,0x73,0x74,0x75,0x76,0x77, 0xb9,0x79,0x7a,0x7b,0x7c,0x7d,0x7e,0x7f, /* 70 */
+	          /*r*/                          /*r*/
 	0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87, 0x88,0x89,0x8a,0x8b,0x48,0x8d,0x8e,0x8f, /* 80 */
 	                                                             /*x*/
-	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0xbc, 0x98,0x99,0x9a,0x9b,0x9c,0xc6,0x9e,0x9f, /* 90 */
-	                                   /*x*/
-	0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7, 0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf, /* a0 */
-	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7, 0xb8,0xb9,0xba,0xbb,0xbc,0xbd,0xbe,0x33, /* b0 */
-	                                                                            /*x*/
-	0xc0,0xc1,0xc2,0xc3,0xc4,0x36,0xc6,0xc7, 0xc8,0xc9,0xc6,0xea,0xcc,0xcd,0xce,0xcf, /* c0 */
-                             /*x*/                     /*x*//*x*/
+	0x90,0x91,0x92,0x93,0x94,0x95,0x96,0xbc, 0x98,0x99,0x9a,0xf3,0x9c,0xc6,0x9e,0xe8, /* 90 */
+	                                   /*x*/                /*r*/     /*x*/     /*r*/
+	0xa0,0xa1,0xfc,0x8c,0xa4,0xa5,0xa6,0xa7, 0xa8,0xa9,0xaa,0xbf,0xac,0xad,0xae,0xaf, /* a0 */
+	          /*?*//*r*/                                    /*r*/
+	0xb0,0xb1,0xb2,0xb3,0xb4,0xb5,0xb6,0xb7, 0xb8,0xb9,0xba,0xbb,0x07,0xbd,0xbe,0x33, /* b0 */
+	                                                             /*r*/          /*x*/
+	0xc0,0xc1,0xc2,0xc3,0xc4,0x36,0xc6,0xc7, 0xc8,0xc9,0xc6,0xea,0xcc,0xcd,0x1e,0xe8, /* c0 */
+	                         /*r*/                     /*x*//*x*/          /*r*//*r*/
 	0xd0,0xd1,0xd2,0xd3,0xd4,0xd5,0xd6,0xd7, 0xbb,0xd9,0xda,0xdb,0xdc,0xdd,0xde,0xdf, /* d0 */
 	                                         /*x*/
-	0xe0,0xe1,0xe2,0xbd,0xe4,0xe5,0xe6,0xe7, 0xe8,0xc7,0xea,0x36,0xec,0xed,0xee,0xef, /* e0 */
-	               /*?*/                          /*?*/     /*?*/
+	0xe0,0xe1,0x74,0xbd,0xe4,0xe5,0xe6,0xe7, 0xe8,0xc7,0xea,0x36,0xec,0xed,0x33,0xef, /* e0 */
+	          /*r*//*r*/                          /*x*/     /*r*/          /*r*/
 	0xf0,0xf1,0xf2,0xf3,0xf4,0xf5,0xf6,0x8e, 0xf8,0xf9,0x36,0xfb,0xfc,0xfd,0xfe,0xff, /* f0 */
-                                       /*x*/           /*?*/
+		                             /*x*/           /*x*/
 };
 
 static const nec_config ts004dash_config ={ ts004dash_decryption_table, };