diff --git a/PC2Converter/PC2Converter/MainForm.cs b/PC2Converter/PC2Converter/MainForm.cs index 07f6616..696c2bf 100644 --- a/PC2Converter/PC2Converter/MainForm.cs +++ b/PC2Converter/PC2Converter/MainForm.cs @@ -63,25 +63,7 @@ namespace PC2Converter int[][] SC_StudioCBitMap = { - /* chuck e. */ new int[]{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 } - }; - - int[] FS_RAE3stBitMap = { - 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37, - 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188, - 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62, - 166, 151, 152, 153, 156, 157, 158, 161, 162, 163, 164, 154, 155, 159, 160, 165, - 30, 23, 24, 26, 27, 28, 29, 25, 21, 22, 33, 35, 34, 31, 32, 63, 64, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 189, 190, 194, 211, 212, 213, - 167, 191, 192, 193, 171, 172, 48, - 39, 38, 47, 46, 49, 50, - 88, 86, 85, 82, 242, 84, 83, 81, 238, 239, 240, 87, - 93, 94, 91, 92, 89, 90, - 229, 228, 227, 226, 224, 223, 221, 219, 218, 217, 216, 222, - 235, 232, 231, 234, 236, 237, 233, 242, 243, - 67, 68, 69, 66, 71, 72, 73, - 78, 77, 76, 79, 80, - 220, 244, 245, 225, 230, 241 + /* chuck e. */ new int[]{ 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32 } }; int[] FS_CyberBitMap = { @@ -114,6 +96,35 @@ namespace PC2Converter 220, 244, 245, 225, 77, 241, 240, 87, 222, 0 }; + int[] FS_RAE3stBitMap = { + 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37, + 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188, + 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62, + 166, 151, 152, 153, 156, 157, 158, 161, 162, 163, 164, 154, 155, 159, 160, 165, + 30, 23, 24, 26, 27, 28, 29, 25, 21, 22, 33, 35, 34, 31, 32, 63, 64, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 189, 190, 194, 211, 212, 213, + 167, 191, 192, 193, 171, 172, 48, + 39, 38, 47, 46, 49, 50, + 88, 86, 85, 82, 242, 84, 83, 81, 238, 239, 240, 87, + 93, 94, 91, 92, 89, 90, + 229, 228, 227, 226, 224, 223, 221, 219, 218, 217, 216, 222, + 235, 232, 231, 234, 236, 237, 233, 242, 243, + 67, 68, 69, 66, 71, 72, 73, + 78, 77, 76, 79, 80, + 220, 244, 245, 225, 230, 241 + }; + + int[] FS_StudioCBitMap = { + 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32, + 33, 36, 34, 35, 40, 160, 161, + 177, 178, + 44, 45, + 151, 154, 152, 153, 155, 157, 156, 181, 180, 182, + 172, 174, 173, 171, + 166, 165, 164, + 159, 163, 167, 168, 176, 169, 170, 162, 179 + }; + int[] CyberRosettaInvertedBits = { 2, 181, 41, 59, 58, 151, 163, 26, 35, 31 }; int[] RAE3stAPSDescrambleTable = { 10, 11, 0, 1, 2, 3, 4, 12, 13, 5, 6, 7, 8, 9, 14, 15}; @@ -489,6 +500,7 @@ namespace PC2Converter break; case "UST 256 Bits (Full Studio C)": bitsCount = 256; + targetBits = FS_StudioCBitMap; break; }