Index: oup/current/Main.dfm =================================================================== --- oup/current/Main.dfm (revision 51) +++ oup/current/Main.dfm (revision 52) @@ -62,5 +62,5 @@ Caption = '&Main' object menu_loadfile: TTBItem - Caption = '&Open level-file ...' + Caption = '&Open .dat/.raw ...' ImageIndex = 0 ShortCut = 16463 @@ -83,11 +83,11 @@ Caption = '&Convert' object menu_createdb: TTBItem - Caption = 'Create level-database ...' - ImageIndex = 1 + Caption = 'Convert .dat/.raw to DB ...' + ImageIndex = 2 OnClick = menu_createdbClick end object menu_createlvl: TTBItem - Caption = 'Create level-files ...' - ImageIndex = 2 + Caption = 'Convert DB to .dat/.raw ...' + ImageIndex = 3 OnClick = menu_createlvlClick end @@ -97,6 +97,6 @@ Enabled = False object menu_preview: TTBItem - Caption = '&Preview Window ...' - ImageIndex = 3 + Caption = '&Preview window ...' + ImageIndex = 4 ShortCut = 16464 OnClick = menu_previewClick @@ -104,5 +104,5 @@ object menu_binedit: TTBItem Caption = '&Binary .dat editor ...' - ImageIndex = 4 + ImageIndex = 5 ShortCut = 16450 OnClick = menu_bineditClick @@ -110,5 +110,5 @@ object menu_rawedit: TTBItem Caption = 'Binary .&raw editor ...' - ImageIndex = 5 + ImageIndex = 6 ShortCut = 16466 OnClick = menu_raweditClick @@ -116,5 +116,5 @@ object menu_txmpreplace: TTBItem Caption = '&TXMP replacer ...' - ImageIndex = 6 + ImageIndex = 7 ShortCut = 16468 OnClick = menu_txmpreplaceClick @@ -122,10 +122,10 @@ object menu_extractor: TTBItem Caption = 'File &extractor ...' - ImageIndex = 7 + ImageIndex = 8 ShortCut = 16453 OnClick = menu_extractorClick end object menu_meta: TTBItem - Caption = '&Meta Editor' + Caption = '&Meta editor' Enabled = False ShortCut = 16461 @@ -135,5 +135,5 @@ Caption = '&File compare ...' Enabled = False - ImageIndex = 9 + ImageIndex = 10 ShortCut = 16454 OnClick = menu_filecompareClick @@ -220,5 +220,5 @@ Caption = '.dat -> DB' DisplayMode = nbdmImageAndText - ImageIndex = 1 + ImageIndex = 2 OnClick = menu_createdbClick end @@ -226,5 +226,5 @@ Caption = 'DB -> .dat' DisplayMode = nbdmImageAndText - ImageIndex = 2 + ImageIndex = 3 OnClick = menu_createlvlClick end @@ -235,5 +235,5 @@ DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 3 + ImageIndex = 4 OnClick = menu_previewClick end @@ -242,5 +242,5 @@ DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 4 + ImageIndex = 5 OnClick = menu_bineditClick end @@ -249,12 +249,12 @@ DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 5 + ImageIndex = 6 OnClick = menu_raweditClick end object tb_txmpreplacer: TTBItem - Caption = 'TXMP Replacer' + Caption = 'TXMP replacer' DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 6 + ImageIndex = 7 OnClick = menu_txmpreplaceClick end @@ -263,9 +263,9 @@ DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 7 + ImageIndex = 8 OnClick = menu_extractorClick end object tb_meta: TTBItem - Caption = 'Meta Editor' + Caption = 'MetaEditor' DisplayMode = nbdmImageAndText Enabled = False @@ -276,5 +276,5 @@ DisplayMode = nbdmImageAndText Enabled = False - ImageIndex = 9 + ImageIndex = 10 OnClick = menu_filecompareClick end @@ -358,5 +358,5 @@ Top = 112 Bitmap = { - 494C01010A000E00040010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600 + 494C01010B000E00040010001000FFFFFFFFFF00FFFFFFFFFFFFFFFF424D3600 0000000000003600000028000000400000004000000001002000000000000040 0000000000000000000000000000000000000000000000000000000000000000 @@ -489,4 +489,6 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000FFFFFF0000000000000000000000000000000000000000000000 000000000000000000000000000000000000FFFFFF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -494,7 +496,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 + 00000000000000000000FFFFFF0000000000000000000000FF000000FF000000 FF000000FF000000000000000000FFFFFF000000000000000000000000000000 0000000000000000FF000000FF00000000000000000000000000000000000000 @@ -502,15 +504,15 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 FF000000FF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000FF000000FF000000 + FF000000FF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00000000000000FF000000FF00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 + 00000000000000000000FFFFFF0000000000000000000000FF000000FF000000 FF000000FF000000000000000000FFFFFF000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -518,7 +520,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000000000000000000000FF000000FF000000 + FF000000FF000000000000000000000000000000000000000000000000000000 + 000000000000FFFFFF000000000000000000000000000000FF000000FF000000 FF000000FF00000000000000000000000000FFFFFF0000000000000000000000 0000FF000000FF00000000000000000000000000000000000000000000000000 @@ -527,6 +529,6 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000000000000000000000000000FFFF + FF00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000FFFFFF000000 0000FF000000FF00000000000000000000000000000000000000000000000000 @@ -534,7 +536,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 + 0000FFFFFF0000000000000000000000000000000000FF000000FF000000FF00 0000FF00000000000000000000000000000000000000FFFFFF00000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -542,7 +544,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 + 0000FF00000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00FFFFFF00FFFFFF00000000000000000000000000FF000000FF000000FF00 0000FF000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF FF00FFFFFF00FFFFFF0000000000000000000000000000000000000000000000 @@ -550,7 +552,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 + 0000FFFFFF0000000000000000000000000000000000FF000000FF000000FF00 0000FF00000000000000000000000000000000000000FFFFFF00000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -558,7 +560,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 00000000000000000000000000000000000000000000FF000000FF000000FF00 + 0000FF000000000000000000000000000000000000000000000000000000FFFF + FF000000000000000000000000000000000000000000FF000000FF000000FF00 0000FF0000000000000000000000000000000000000000000000FFFFFF000000 00000000FF000000FF0000000000000000000000000000000000000000000000 @@ -567,6 +569,6 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000000000000000000000000000000000FFFFFF00000000000000 + 0000000000000000FF000000FF00000000000000000000000000000000000000 000000000000000000000000000000000000FFFFFF0000000000000000000000 00000000FF000000FF0000000000000000000000000000000000000000000000 @@ -574,10 +576,8 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 + 0000000000000000FF000000FF00000000000000000000FFFF0000FFFF0000FF FF0000FFFF000000000000000000FFFFFF000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -586,11 +586,13 @@ 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF FF0000FFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF + FF00000000000000000000000000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF FF00000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 + 000000000000FF000000FF000000000000000000000000FFFF0000FFFF0000FF FF0000FFFF000000000000000000FFFFFF000000000000000000000000000000 000000000000FF000000FF000000000000000000000000000000000000000000 @@ -598,7 +600,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF0000000000000000000000000000000000FFFFFF00000000000000 + 000000000000FF000000FF000000000000000000000000FFFF0000FFFF0000FF FF0000FFFF00000000000000000000000000FFFFFF000000000000FFFF0000FF FF0000000000FF000000FF000000000000000000000000000000000000000000 @@ -614,7 +616,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000008080800080808000808 + 0800080808001018180010101000080808001010100008080800080810001010 + 1000101010000808080008080800000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -622,7 +624,7 @@ 0000000000000000000000000000000000000000000000000000000000000000 000000FFFF0000FFFF0000FFFF0000FFFF000000000000000000000000000000 - 000000FFFF0000FFFF0000FFFF0000FFFF000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000FFFFFF0000000000000000000000000000000000000000000000 + 000000FFFF0000FFFF0000FFFF0000FFFF000000000000000000202018002920 + 18005252520039313100393131009C9C9C0039313100393131009C9C9C000000 + 0000292020002920180000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -630,7 +632,7 @@ 00000000000000000000000000000000000000FFFF0000000000000000000000 00000000000000C1C100009A9A00008585000085850000000000000000000000 - 00000000000000FFFF0000FFFF0000FFFF00000000000000FF000000FF000000 - FF000000FF000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF0000000000FF00000000000000FF0000000000 + 00000000000000FFFF0000FFFF0000FFFF000000000000000000292018002920 + 20005252520039313100DEDEDE00A4A4A40039313100DEDEDE00A4A4A4000000 + 000029202000292020000000000000000000FF00000000000000FF0000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 @@ -638,7 +640,7 @@ 0000000000000000FF00000000000000FF0000FFFF0000FFFF00000000000000 0000000B0B000032320000707000007C7C00007C7C000070700000323200000B - 0B00000000000000000000FFFF0000FFFF00000000000000FF000000FF000000 - FF000000FF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FF00000000000000FF000000FF00 + 0B00000000000000000000FFFF0000FFFF000000000000000000292018002920 + 20005252520039313100DEDEDE00A4A4A40039313100DEDEDE00A4A4A4000000 + 000029202000292020000000000000000000FF00000000000000FF000000FF00 0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 @@ -646,23 +648,23 @@ FF000000FF000000FF00000000000000FF0000FFFF0000FFFF0000D9D9000016 16000060600000B1B10000E0E00000F9F90000F9F90000E0E00000B1B1000060 - 600000161600000000000000000000FFFF00000000000000FF000000FF000000 - FF000000FF000000000000000000000000000000000000000000000000000000 - 00000000000000000000FFFFFF0000000000FF00000000000000FF000000FF00 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF0000FFFF0000EDED00008C8C000070 + 600000161600000000000000000000FFFF000000000000000000292029003129 + 2900525252003931310039313100A4A4A4003931310039313100A4A4A4000000 + 000031292900312929000000000000000000FF00000000000000FF0000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000FF000000FF00000000000000FF0000FFFF0000EDED00008C8C000070 700000D5D50000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000D5 - D50000606000000B0B000000000000000000000000000000FF000000FF000000 - FF000000FF000000000000000000000000000000000000000000000000000000 - 000000000000FFFFFF000000000000000000FF00000000000000FF000000FF00 - 0000000000000000000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF00000000000000000000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF000000000000C2C2000067670000B1 + D50000606000000B0B0000000000000000000000000000000000525252005252 + 5200525252005252520052525200525252005252520052525200525252005252 + 520052525200525252000000000000000000FF00000000000000FF0000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000FF000000FF00000000000000FF000000000000C2C2000067670000B1 B10000FFFF0000C9C90000414100002C2C00002C2C00002C2C0000EAEA0000FF FF0000B1B1000032320000000000000000000000000000000000000000000000 - 000000000000000000000000000000000000000000000000000000000000FFFF - FF0000000000000000000000000000000000FF00000000000000FF000000FF00 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000000000FF00000000000000FF000000FF00 0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 @@ -670,23 +672,23 @@ FF000000FF000000FF00000000000000FF0000000000000000000070700000E0 E00000C0C000002D2D00002B2B000062620000373700002121000039390000C9 - C90000E0E00000707000000000000000000000000000FF000000FF000000FF00 - 0000FF0000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF00000000000000000000000000FF00000000000000FF000000FF00 - 0000FF0000000000000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 + C90000E0E00000707000000000000000000000000000000000000000FF000000 + FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 + FF000000FF000000FF000000000000000000FF00000000000000FF0000000000 + 000000000000000000000000000000000000000000000000000000000000FF00 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + FF000000FF000000FF00000000000000FF0000000000000000000079790000F8 + F80000929200003C3C0000C9C90000FFFF0000FFFF0000FFFF0000464600006A + 6A0000F8F800007C7C00008585000000000000000000000000000000FF000000 FF000000FF000000000000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF0000000000000000000079790000F8 - F80000929200003C3C0000C9C90000FFFF0000FFFF0000FFFF0000464600006A - 6A0000F8F800007C7C00008585000000000000000000FF000000FF000000FF00 - 0000FF00000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF00FFFFFF00FFFFFF000000000000000000FF00000000000000FF000000FF00 - 0000FF0000000000000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF000000FF000000000000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF0000000000000000000079790000F8 + FF000000FF000000FF000000000000000000FF00000000000000FF0000000000 + 000000000000000000000000000000000000000000000000000000000000FF00 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + FF000000FF000000FF00000000000000FF0000000000000000000079790000F8 F80000F4F40000F4F40000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF - FF0000F8F800007C7C000085850000FFFF0000000000FF000000FF000000FF00 - 0000FF0000000000000000000000000000000000000000000000000000000000 - 0000FFFFFF00000000000000000000000000FF00000000000000FF000000FF00 + FF0000F8F800007C7C000085850000FFFF0000000000000000000000FF000000 + FF000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000 + 00000000FF000000FF000000000000000000FF00000000000000FF000000FF00 0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 @@ -694,23 +696,23 @@ FF000000FF000000FF00000000000000FF0000FFFF00000000000060600000E0 E00000FFFF0000424200002A2A0000FFFF0000FFFF00003B3B000052520000FF - FF0000E0E00000707000009A9A0000FFFF0000000000FF000000FF000000FF00 - 0000FF000000000000000000000000000000000000000000000000000000FFFF - FF0000000000000000000000000000000000FF00000000000000FF000000FF00 - 0000FF000000FF00000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF000000FF000000FF0000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF0000FFFF0000C2C2000032320000B1 + FF0000E0E00000707000009A9A0000FFFF0000000000000000000000FF000000 + 000000000000FFFFFF00FFFFFF000000000000000000FFFFFF00FFFFFF000000 + 0000000000000000FF000000000000000000FF00000000000000FF0000000000 + 0000000000000000000000000000000000000000000000000000FF000000FF00 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 00000000000000000000000000000000000000000000000000000000FF000000 + FF000000FF000000FF00000000000000FF0000FFFF0000C2C2000032320000B1 B10000C9C900005858000045450000FFFF0000FFFF0000434300005E5E0000FF - FF0000B1B1000032320000C2C20000FFFF000000000000000000000000000000 - 00000000000000000000000000000000000000000000FFFFFF00000000000000 - 0000000000000000FF000000FF0000000000FF00000000000000FF000000FF00 - 0000FF000000FF00000000000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF000000FF000000FF0000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF0000FFFF0000EDED00008C8C000060 + FF0000B1B1000032320000C2C20000FFFF0000000000000000000000FF000000 + 0000FFFFFF00FFFFFF00000000006A00BD006A00BD0000000000FFFFFF00FFFF + FF00000000000000FF000000000000000000FF00000000000000FF0000000000 + 0000000000000000000000000000000000000000000000000000FF000000FF00 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 00000000000000000000000000000000000000000000000000000000FF000000 + FF000000FF000000FF00000000000000FF0000FFFF0000EDED00008C8C000060 600000D5D50000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000D5 - D50000606000000B0B000000000000FFFF000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 - 0000000000000000FF000000FF0000000000FF00000000000000FF000000FF00 + D50000606000000B0B000000000000FFFF0000000000000000000000FF000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000FF000000000000000000FF00000000000000FF000000FF00 0000FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF00 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 @@ -718,15 +720,15 @@ FF000000FF000000FF00000000000000FF0000FFFF0000FFFF0000D9D900007F 7F000060600000B1B10000E0E00000F8F80000F8F80000E0E00000B1B1000070 - 7000001616000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF0000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF - FF0000000000000000000000000000000000FF00000000000000FF000000FF00 - 0000FF000000FF000000FF000000000000000000000000000000000000000000 - 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - FF000000FF000000FF000000FF00000000000000000000000000000000000000 - 0000000000000000FF00000000000000FF000000000000FFFF0000FFFF0000D9 + 70000016160000000000000000000000000000000000000000000000FF000000 + FF00000000000000000000000000000000000000000000000000000000000000 + 00000000FF000000FF000000000000000000FF00000000000000FF0000000000 + 00000000000000000000000000000000000000000000FF000000FF000000FF00 + 0000FF000000FF00000000000000FF0000000000FF00000000000000FF000000 + 000000000000000000000000000000000000000000000000FF000000FF000000 + FF000000FF000000FF00000000000000FF000000000000FFFF0000FFFF0000D9 D900008C8C00003232000060600000797900007979000070700000676700008C - 8C0000D9D9000000000000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF000000000000000000000000000000000000000000FFFFFF000000 - 000000000000FF000000FF000000000000000000000000000000000000000000 + 8C0000D9D90000000000000000000000000000000000000000000000FF000000 + FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 + FF000000FF000000FF0000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -734,7 +736,7 @@ 000000000000000000000000000000000000000000000000000000FFFF0000FF FF0000EDED0000C2C2000000000000000000000000000000000000C2C20000ED - ED0000FFFF0000FFFF0000000000000000000000000000FFFF0000FFFF0000FF - FF0000FFFF0000000000000000000000000000000000FFFFFF00000000000000 - 000000000000FF000000FF000000000000000000000000000000000000000000 + ED0000FFFF0000FFFF0000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -744,130 +746,128 @@ FF0000FFFF0000FFFF0000FFFF00000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000000000000000EEB40000EEB40000EEB4 - 0000EEB40000EEB40000EEB40000EEB40000EEB40000EEB40000EEB40000EEB4 - 0000EEB40000EEB40000EEB40000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000FF000000FF000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000FF000000FF000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000FF0000000000FF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000FF0000000000FF0000000000000000000000 - 0000000000000000000000000000000000000000000008080800080808000808 - 0800080808001018180010101000080808001010100008080800080810001010 - 10001010100008080800080808000000000000000000A4A4A400A4A4A400A4A4 - A400A4A4A40000000000EEB40000EEB40000EEB40000EEB4000000000000A4A4 - A400A4A4A400A4A4A400A4A4A400EEB400000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 000000000000FF000000FF000000FF0000000000FF000000FF000000FF000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000FF000000FF000000FF0000000000FF000000FF000000FF000000 - 0000000000000000000000000000000000000000000000000000202018002920 - 18005252520039313100393131009C9C9C0039313100393131009C9C9C000000 - 000029202000292018000000000000000000000000004A4A4A004A4A4A004A4A - 4A00A4A4A40018800000944131009441310094413100EEB400000E0E0E004A4A - 4A004A4A4A004A4A4A00A4A4A400EEB40000000000000000000000000000FF00 - 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 + 00000000000000000000000000000000000000000000000000000000000000FF + 000000FF00000000000000000000FF0000000000FF00000000000000000000FF + 000000FF000000000000000000000000000000000000000000000000000000FF + 000000FF000000000000000000000000000000000000000000000000000000FF + 000000FF0000000000000000000000000000000000000000000000000000FF00 + 0000FF000000FF00000000000000000000000000000000000000000000000000 FF000000FF00000000000000000000000000000000000000000000000000FF00 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 - FF000000FF000000000000000000000000000000000000000000292018002920 - 20005252520039313100DEDEDE00A4A4A40039313100DEDEDE00A4A4A4000000 - 000029202000292020000000000000000000000000004A4A4A004A4A4A004A4A - 4A00A4A4A40018920000944131009441310094413100EEB40000189200004A4A - 4A004A4A4A004A4A4A00A4A4A400EEB4000000000000FF000000FF000000FF00 + FF000000FF000000000000000000000000000000000000FF000000FF00000000 + 000000000000FF000000FF000000FF0000000000FF000000FF000000FF000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF00000000000000000000FF000000FF000000FF00 0000FF0000000000000000000000000000000000000000000000000000000000 + 00000000FF000000FF000000FF000000000000000000FF000000FF0000000000 + 0000000000000000000000000000FF0000000000FF0000000000000000000000 + 0000000000000000FF000000FF00000000000000000000FF000000000000FF00 + 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 + FF000000FF000000000000FF0000000000000000000000FF0000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000FF00000000000000000000FF000000FF000000FF00 + 0000000000000000000000000000FF0000000000FF000000FF00000000000000 + 0000000000000000FF000000FF000000000000000000FF000000FF000000FF00 + 0000000000000000000000000000FF0000000000FF0000000000000000000000 + 00000000FF000000FF000000FF00000000000000000000FF000000000000FF00 + 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 + FF000000FF000000000000FF0000000000000000000000FF0000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000FF00000000000000000000FF000000FF000000FF00 + 00000000000000000000FF000000FF0000000000FF000000FF000000FF000000 + 0000000000000000FF000000FF000000000000000000FF000000FF0000000000 + 0000000000000000000000000000FF0000000000FF0000000000000000000000 + 0000000000000000FF000000FF00000000000000000000FF000000000000FF00 + 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 + FF000000FF000000000000FF0000000000000000000000FF0000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000FF00000000000000000000FF000000FF000000FF00 + 00000000000000000000FF000000FF0000000000FF000000FF000000FF000000 FF000000FF000000FF000000FF000000000000000000FF000000FF0000000000 - 0000000000000000000000000000FF0000000000FF0000000000000000000000 - 0000000000000000FF000000FF00000000000000000000000000292018002920 - 20005252520039313100DEDEDE00A4A4A40039313100DEDEDE00A4A4A4000000 - 000029202000292020000000000000000000000000004A4A4A00000000000000 - 0000A4A4A40000000000944131000000000000000000EEB40000020202004A4A - 4A000000000000000000A4A4A400EEB40000FF000000FF000000FF000000FF00 - 0000000000000000000000000000000000000000000000000000000000000000 - 00000000FF000000FF000000FF000000FF00FF000000FF000000FF000000FF00 - 0000000000000000000000000000FF0000000000FF0000000000000000000000 - 00000000FF000000FF000000FF000000FF000000000000000000292029003129 - 2900525252003931310039313100A4A4A4003931310039313100A4A4A4000000 - 00003129290031292900000000000000000000000000A4A4A4004A4A4A00A4A4 - A400A4A4A40000000000EEB4000094413100EEB40000EEB4000000000000A4A4 - A4004A4A4A00A4A4A400A4A4A400EEB40000FF000000FF000000FF0000000000 - 00000000000000000000FF000000FF0000000000FF000000FF00000000000000 - 0000000000000000FF000000FF000000FF00FF000000FF000000FF0000000000 - 0000000000000000000000000000FF0000000000FF0000000000000000000000 - 0000000000000000FF000000FF000000FF000000000000000000525252005252 - 5200525252005252520052525200525252005252520052525200525252005252 - 520052525200525252000000000000000000000000000000000014007F000000 - 0000000000000000000000000000180094000000000000000000000000000000 - 000014007F001880000000000000EEB40000FF000000FF000000FF0000000000 - 000000000000FF000000FF000000FF0000000000FF000000FF000000FF000000 - 0000000000000000FF000000FF000000FF00FF000000FF000000000000000000 000000000000FF00000000000000FF0000000000FF00000000000000FF000000 - 000000000000000000000000FF000000FF000000000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000000000000000000000000000000018800000188000000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000001892000000000000EEB40000FF000000FF000000FF0000000000 - 000000000000FF000000FF000000FF0000000000FF000000FF000000FF000000 - FF000000FF000000FF000000FF000000FF00FF000000FF000000000000000000 - 0000FF000000FF000000FF000000FF0000000000FF000000FF000000FF000000 - FF0000000000000000000000FF000000FF0000000000000000000000FF000000 - FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 - FF000000FF000000FF0000000000000000000000000018800000188000000000 - 0000000000000000000018920000189200000000000000000000000000000000 - 0000000000001892000000000000EEB40000FF000000FF000000FF0000000000 + 0000000000000000FF000000FF00000000000000000000FF000000000000FF00 + 0000FF000000FF000000FF00000000000000000000000000FF000000FF000000 + FF000000FF000000000000FF0000000000000000000000FF0000000000000000 + 000000000000000000000000000000FFFF0000FFFF0000000000000000000000 + 0000000000000000000000FF00000000000000000000FF000000FF000000FF00 + 0000000000000000000000FFFF0000FFFF0000FFFF0000FFFF000000FF000000 + FF000000FF000000FF000000FF000000000000000000FF000000FF0000000000 000000000000FF00000000FFFF0000FFFF0000FFFF0000FFFF000000FF000000 - FF000000FF000000FF000000FF000000FF00FF000000FF000000000000000000 - 0000FF000000FF00000000FFFF0000FFFF0000FFFF0000FFFF000000FF000000 - FF0000000000000000000000FF000000FF0000000000000000000000FF000000 - FF000000FF000000000000000000000000000000000000000000000000000000 - FF000000FF000000FF0000000000000000000000000018800000188000000000 - 0000000000000000000000000000000000001892000000000000000000000000 - 0000000000001892000000000000EEB40000FF000000FF000000FF0000000000 - 0000000000000000000000FFFF000000000000FFFF0000FFFF0000FFFF0000FF - FF000000FF000000FF000000FF000000FF00FF000000FF000000000000000000 - 000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF - FF0000000000000000000000FF000000FF0000000000000000000000FF000000 - FF000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFFFF00000000000000 - 00000000FF000000FF0000000000000000000000000018800000189200000000 - 0000000000000000000000000000180094000000000018920000000000000000 - 0000188000001892000000000000EEB40000FF000000FF00000000FFFF0000FF - FF000000000000000000000000000000000000FFFF0000FFFF0000FFFF0000FF - FF0000FFFF0000FFFF000000FF000000FF00FF000000FF000000000000000000 + 0000000000000000FF000000FF00000000000000000000FF000000000000FF00 + 0000FF0000000000000000000000000000000000000000000000000000000000 + FF000000FF000000000000FF0000000000000000000000FF0000000000000000 00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 - 000000000000000000000000FF000000FF0000000000000000000000FF000000 - 000000000000FFFFFF00FFFFFF000000000000000000FFFFFF00FFFFFF000000 - 0000000000000000FF000000000000000000000000000E0E0E00189200000202 - 0200000000000000000000000000A4A4A4000000000000000000000000000000 - 0000188000001880000000000000EEB4000000FFFF0000FFFF0000FFFF0000FF - FF0000FFFF0000000000000000000000000000FFFF0000FFFF0000FFFF0000FF - FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 + 0000000000000000000000FF00000000000000000000FF000000FF000000FF00 + 000000000000000000000000000000FFFF000000000000FFFF0000FFFF0000FF + FF000000FF000000FF000000FF000000000000000000FF000000FF0000000000 + 00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 + 0000000000000000FF000000FF00000000000000000000FF0000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000FF0000000000000000000000FF00000000000000FF + FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000FFFF000000000000FF00000000000000000000FF00000000FFFF0000FF + FF0000FFFF000000000000000000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF0000FFFF000000FF000000000000000000FF000000FF0000000000 0000000000000000000000FFFF0000FFFF0000FFFF0000FFFF00000000000000 - 00000000000000FFFF0000FFFF0000FFFF0000000000000000000000FF000000 - 0000FFFFFF00FFFFFF00000000006A00BD006A00BD0000000000FFFFFF00FFFF - FF00000000000000FF00000000000000000000000000A4A4A400A4A4A400A4A4 - A400A4A4A400A4A4A400A4A4A40094413100A4A4A400A4A4A400A4A4A400A4A4 - A400A4A4A400A4A4A400EEB40000EEB400000000000000FFFF0000FFFF0000FF - FF000000000000000000000000000000000000FFFF0000FFFF0000FFFF0000FF + 0000000000000000FF000000FF00000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 + 00000000000000FF000000FF0000000000000000000000FFFF0000FFFF0000FF + FF0000FFFF0000FFFF0000000000000000000000000000FFFF0000FFFF0000FF FF0000FFFF0000FFFF0000FFFF00000000000000000000FFFF0000FFFF0000FF - FF00000000000000000000FFFF0000FFFF0000FFFF0000FFFF00000000000000 - 000000FFFF0000FFFF0000FFFF000000000000000000000000000000FF000000 - 0000000000000000000000000000000000000000000000000000000000000000 - 0000000000000000FF00000000000000000000000000EEB40000EEB40000EEB4 - 0000EEB40000EEB40000EEB40000EEB40000EEB40000EEB40000EEB40000EEB4 - 0000EEB40000EEB40000EEB40000EEB4000000000000000000000000000000FF - FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF + FF0000000000000000000000000000FFFF0000FFFF0000000000000000000000 + 000000FFFF0000FFFF0000FFFF000000000000000000000000000000000000FF + 000000FF000000000000000000000000000000000000000000000000000000FF + 000000FF000000000000000000000000000000000000000000000000000000FF + 000000FF0000000000000000000000FFFF0000FFFF00000000000000000000FF + 000000FF000000000000000000000000000000000000000000000000000000FF + FF0000FFFF000000000000000000000000000000000000FFFF0000FFFF0000FF FF0000FFFF0000000000000000000000000000000000000000000000000000FF - FF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FF - FF0000FFFF0000000000000000000000000000000000000000000000FF000000 - FF00000000000000000000000000000000000000000000000000000000000000 - 00000000FF000000FF0000000000000000000000000000000000000000000000 - 0000000000001880000018920000189200001892000018920000188000000000 - 0000000000000000000000000000EEB400000000000000000000000000000000 + FF0000FFFF00000000000000000000FFFF0000FFFF00000000000000000000FF + FF0000FFFF000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 00000000000000FF000000FF0000000000000000000000FF000000FF00000000 + 0000000000000000000000000000000000000000000000000000000000000000 00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 0000000000000000000000000000000000000000000000000000000000000000 00000000000000FFFF0000FFFF0000FFFF0000FFFF0000FFFF0000FFFF000000 - 00000000000000000000000000000000000000000000000000000000FF000000 - FF000000FF000000FF000000FF000000FF000000FF000000FF000000FF000000 - FF000000FF000000FF000000000000000000EEB4000000000000000000000000 - 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000FF000000FF000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000FF000000FF000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000FFFF0000FFFF0000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 000000000000000000000000000000FFFF0000FFFF0000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 @@ -878,18 +878,17 @@ 0000000000000000000000000000000000000000000000000000000000000000 0000000000000000000000000000000000000000000000000000000000000000 - 00000000000000000000000000000000FF7F00FF0000000086F900FF00000000 - 840900FF0000000086FF1F070000000087731F0700000000FFD31F0700000000 - 87BF1F070000000087031F070000000087BF1F070000000087D31F0700000000 - FF731F070000000086FF1F0700000000840F1F070000000086F900FF00000000 - 874900FF00000000FFCF00FF00000000FFFFFFFF0000FFFBE005E005000087FD - 400040000000840040004000000087FD40004000000087FB400040000000FFEF - 40004000000087F7400040000000840340004000000087F740004000000087EF - 400040000000FFB940004000000087D9400040000000840F40004000000087D9 - FE05FE05000087B9FFFFFFFF0000FFFF8001FE7FFE7F80010000F81FF81F8001 - 0000E007E0078001000080018001800100000000000080010000000000000000 - 0000000000000000000000000000800100000000000080010000000000008001 - 0000000000008001000000000000800100008001800180010000E007E0078001 - 0000F81FF81F80010001FE7FFE7F800100000000000000000000000000000000 - 000000000000} + 00000000000000000000000000000000FFFBFF7F00FF000087FD86F900FF0000 + 8400840900FF000087FD86FF1F07000087FB87731F070000FFEFFFD31F070000 + 87F787BF1F070000840387031F07000087F787BF1F07000087EF87D31F070000 + FFB9FF731F07000087D986FF1F070000840F840F1F07000087D986F900FF0000 + 87B9874900FF0000FFFFFFCF00FF00008001FFFFFFFF00008001A007A0070000 + 8001000200020000800100020002000080010002000200000000000200020000 + 0000000200020000800100020002000080010002000200008001000200020000 + 8001000200020000800100020002000080010002000200008001000200020000 + 8001A07FA07F00008001FFFFFFFF0000FE7FFE7FFE7FFE7FF81FF81FF81FF81F + E007E007E007E007800180018001800100000000000000000000000000000000 + 0000000000000000000000000000000000000000000000000000000000000000 + 000000000000000000000000000000008001800180018001E007E007E007E007 + F81FF81FF81FF81FFE7FFE7FFE7FFE7F} end end