diff --git a/Source/engine/clx_sprite.hpp b/Source/engine/clx_sprite.hpp index e8957ed4eca..91a254b47c4 100644 --- a/Source/engine/clx_sprite.hpp +++ b/Source/engine/clx_sprite.hpp @@ -5,21 +5,20 @@ * @brief CLX format sprites. * * CLX is a format used for DevilutionX graphics at runtime. + * CLX encodes pixel in the same way CL2 but encodes metadata differently. * - * It is identical to CL2, except we use the frame header to store the frame's width and height. + * Unlike CL2: * - * CLX frame header (10 bytes, same as CL2): + * 1. CLX frame header stores frame width and height. + * 2. CLX frame header does not store 32-pixel block offsets. * - * Bytes | Type | Value - * :-----:|:--------:|------------------------------------ - * 0..2 | uint16_t | offset to data start (same as CL2) - * 2..4 | uint16_t | width - * 4..6 | uint16_t | height - * 6..10 | - | unused + * CLX frame header is 6 bytes: * - * The CLX format is otherwise identical to CL2. - * - * Since the header is identical to CL2, CL2 can be converted to CLX without reallocation. + * Bytes | Type | Value + * :-----:|:--------:|------------- + * 0..2 | uint16_t | header size + * 2..4 | uint16_t | width + * 4..6 | uint16_t | height * * CL2 reference: https://github.com/savagesteel/d1-file-formats/blob/master/PC-Mac/CL2.md#2-file-structure */ @@ -42,12 +41,10 @@ class OptionalClxSprite; * @brief A single CLX sprite. */ class ClxSprite { - static constexpr uint32_t HeaderSize = 10; - public: explicit constexpr ClxSprite(const uint8_t *data, uint32_t dataSize) : data_(data) - , pixel_data_size_(dataSize - HeaderSize) + , pixel_data_size_(dataSize - LoadLE16(data)) { assert(data != nullptr); } @@ -69,7 +66,7 @@ class ClxSprite { */ [[nodiscard]] constexpr const uint8_t *pixelData() const { - return &data_[HeaderSize]; + return &data_[LoadLE16(data_)]; } [[nodiscard]] constexpr uint32_t pixelDataSize() const diff --git a/Source/utils/cel_to_clx.cpp b/Source/utils/cel_to_clx.cpp index 76fdcc3aaf5..b1865ab30fa 100644 --- a/Source/utils/cel_to_clx.cpp +++ b/Source/utils/cel_to_clx.cpp @@ -86,9 +86,8 @@ OwnedClxSpriteListOrSheet CelToClx(const uint8_t *data, size_t size, PointerOrVa // CLX frame header. const size_t frameHeaderPos = cl2Data.size(); - constexpr size_t FrameHeaderSize = 10; - cl2Data.resize(cl2Data.size() + FrameHeaderSize); - WriteLE16(&cl2Data[frameHeaderPos], FrameHeaderSize); + cl2Data.resize(cl2Data.size() + ClxFrameHeaderSize); + WriteLE16(&cl2Data[frameHeaderPos], ClxFrameHeaderSize); WriteLE16(&cl2Data[frameHeaderPos + 2], frameWidth); unsigned transparentRunWidth = 0; @@ -111,7 +110,6 @@ OwnedClxSpriteListOrSheet CelToClx(const uint8_t *data, size_t size, PointerOrVa ++frameHeight; } WriteLE16(&cl2Data[frameHeaderPos + 4], static_cast(frameHeight)); - memset(&cl2Data[frameHeaderPos + 6], 0, 4); AppendClxTransparentRun(transparentRunWidth, cl2Data); } diff --git a/Source/utils/cl2_to_clx.cpp b/Source/utils/cl2_to_clx.cpp index 1acff2428c7..12eae863f4e 100644 --- a/Source/utils/cl2_to_clx.cpp +++ b/Source/utils/cl2_to_clx.cpp @@ -56,9 +56,8 @@ uint16_t Cl2ToClx(const uint8_t *data, size_t size, const uint16_t frameWidth = widthOrWidths.HoldsPointer() ? widthOrWidths.AsPointer()[frame - 1] : widthOrWidths.AsValue(); const size_t frameHeaderPos = clxData.size(); - constexpr size_t FrameHeaderSize = 10; - clxData.resize(clxData.size() + FrameHeaderSize); - WriteLE16(&clxData[frameHeaderPos], FrameHeaderSize); + clxData.resize(clxData.size() + ClxFrameHeaderSize); + WriteLE16(&clxData[frameHeaderPos], ClxFrameHeaderSize); WriteLE16(&clxData[frameHeaderPos + 2], frameWidth); unsigned transparentRunWidth = 0; @@ -104,7 +103,6 @@ uint16_t Cl2ToClx(const uint8_t *data, size_t size, AppendClxTransparentRun(transparentRunWidth, clxData); WriteLE16(&clxData[frameHeaderPos + 4], static_cast(frameHeight)); - memset(&clxData[frameHeaderPos + 6], 0, 4); } WriteLE32(&clxData[clxDataOffset + 4 * (1 + static_cast(numFrames))], static_cast(clxData.size() - clxDataOffset)); diff --git a/Source/utils/clx_encode.hpp b/Source/utils/clx_encode.hpp index 337e6b9c726..bce740e74fd 100644 --- a/Source/utils/clx_encode.hpp +++ b/Source/utils/clx_encode.hpp @@ -6,6 +6,17 @@ namespace devilution { +/** + * CLX frame header is 6 bytes: + * + * Bytes | Type | Value + * :-----:|:--------:|------------- + * 0..2 | uint16_t | header size + * 2..4 | uint16_t | width + * 4..6 | uint16_t | height + */ +constexpr size_t ClxFrameHeaderSize = 6; + inline void AppendClxTransparentRun(unsigned width, std::vector &out) { while (width >= 0x7F) { diff --git a/Source/utils/pcx_to_clx.cpp b/Source/utils/pcx_to_clx.cpp index cb94648cce9..baba20b5f92 100644 --- a/Source/utils/pcx_to_clx.cpp +++ b/Source/utils/pcx_to_clx.cpp @@ -98,20 +98,13 @@ OptionalOwnedClxSpriteList PcxToClx(AssetHandle &handle, size_t fileSize, int nu for (unsigned frame = 1; frame <= numFrames; ++frame) { WriteLE32(&cl2Data[4 * static_cast(frame)], static_cast(cl2Data.size())); - // Frame header: 5 16-bit values: - // 1. Offset to start of the pixel data. - // 2. Width - // 3. Height - // 4..5. Unused (0) const size_t frameHeaderPos = cl2Data.size(); - constexpr size_t FrameHeaderSize = 10; - cl2Data.resize(cl2Data.size() + FrameHeaderSize); + cl2Data.resize(cl2Data.size() + ClxFrameHeaderSize); // Frame header: - WriteLE16(&cl2Data[frameHeaderPos], FrameHeaderSize); + WriteLE16(&cl2Data[frameHeaderPos], ClxFrameHeaderSize); WriteLE16(&cl2Data[frameHeaderPos + 2], static_cast(width)); WriteLE16(&cl2Data[frameHeaderPos + 4], static_cast(frameHeight)); - memset(&cl2Data[frameHeaderPos + 6], 0, 4); for (unsigned j = 0; j < frameHeight; ++j) { uint8_t *buffer = &frameBuffer[static_cast(j) * width]; diff --git a/Source/utils/surface_to_clx.cpp b/Source/utils/surface_to_clx.cpp index 82460554f7f..8ecba479033 100644 --- a/Source/utils/surface_to_clx.cpp +++ b/Source/utils/surface_to_clx.cpp @@ -31,20 +31,13 @@ OwnedClxSpriteList SurfaceToClx(const Surface &surface, unsigned numFrames, for (unsigned frame = 1; frame <= numFrames; ++frame) { WriteLE32(&clxData[4 * static_cast(frame)], static_cast(clxData.size())); - // Frame header: 5 16-bit values: - // 1. Offset to start of the pixel data. - // 2. Width - // 3. Height - // 4..5. Unused (0) const size_t frameHeaderPos = clxData.size(); - constexpr size_t FrameHeaderSize = 10; - clxData.resize(clxData.size() + FrameHeaderSize); + clxData.resize(clxData.size() + ClxFrameHeaderSize); // Frame header: - WriteLE16(&clxData[frameHeaderPos], FrameHeaderSize); + WriteLE16(&clxData[frameHeaderPos], ClxFrameHeaderSize); WriteLE16(&clxData[frameHeaderPos + 2], static_cast(width)); WriteLE16(&clxData[frameHeaderPos + 4], static_cast(frameHeight)); - memset(&clxData[frameHeaderPos + 6], 0, 4); unsigned transparentRunWidth = 0; size_t line = 0; diff --git a/assets/data/boxleftend.clx b/assets/data/boxleftend.clx index cc4f8864406..a8d9fd077e9 100644 Binary files a/assets/data/boxleftend.clx and b/assets/data/boxleftend.clx differ diff --git a/assets/data/boxmiddle.clx b/assets/data/boxmiddle.clx index fa8de83a096..0844f4989d1 100644 Binary files a/assets/data/boxmiddle.clx and b/assets/data/boxmiddle.clx differ diff --git a/assets/data/boxrightend.clx b/assets/data/boxrightend.clx index dcc2ae2c92d..9f3145e9a5f 100644 Binary files a/assets/data/boxrightend.clx and b/assets/data/boxrightend.clx differ diff --git a/assets/data/charbg.clx b/assets/data/charbg.clx index 089038e08d2..20dd4488c90 100644 Binary files a/assets/data/charbg.clx and b/assets/data/charbg.clx differ diff --git a/assets/data/dirtybuc.clx b/assets/data/dirtybuc.clx index ac7a312522f..f546c5749a1 100644 Binary files a/assets/data/dirtybuc.clx and b/assets/data/dirtybuc.clx differ diff --git a/assets/data/dirtybucp.clx b/assets/data/dirtybucp.clx index 24513df376f..e3d7f4baafd 100644 Binary files a/assets/data/dirtybucp.clx and b/assets/data/dirtybucp.clx differ diff --git a/assets/data/health.clx b/assets/data/health.clx index c6aa820aeb3..1a2707e8d02 100644 Binary files a/assets/data/health.clx and b/assets/data/health.clx differ diff --git a/assets/data/healthbox.clx b/assets/data/healthbox.clx index 7bac37ac8e0..656ce3b29f8 100644 Binary files a/assets/data/healthbox.clx and b/assets/data/healthbox.clx differ diff --git a/assets/data/hintbox.clx b/assets/data/hintbox.clx index 11bc9c07778..edfc5cde308 100644 Binary files a/assets/data/hintbox.clx and b/assets/data/hintbox.clx differ diff --git a/assets/data/hintboxbackground.clx b/assets/data/hintboxbackground.clx index c758963813f..0149317dc06 100644 Binary files a/assets/data/hintboxbackground.clx and b/assets/data/hintboxbackground.clx differ diff --git a/assets/data/hinticons.clx b/assets/data/hinticons.clx index 4851d991bd5..61649e3b547 100644 Binary files a/assets/data/hinticons.clx and b/assets/data/hinticons.clx differ diff --git a/assets/data/monstertags.clx b/assets/data/monstertags.clx index ace3bec0180..0136fa40428 100644 Binary files a/assets/data/monstertags.clx and b/assets/data/monstertags.clx differ diff --git a/assets/data/panel8buc.clx b/assets/data/panel8buc.clx index 45889ca4e84..2ac2a9384dd 100644 Binary files a/assets/data/panel8buc.clx and b/assets/data/panel8buc.clx differ diff --git a/assets/data/panel8bucp.clx b/assets/data/panel8bucp.clx index 5e4740ca241..79aee41fe74 100644 Binary files a/assets/data/panel8bucp.clx and b/assets/data/panel8bucp.clx differ diff --git a/assets/data/resistance.clx b/assets/data/resistance.clx index e3b3dd2fd35..1a4105fbd0e 100644 Binary files a/assets/data/resistance.clx and b/assets/data/resistance.clx differ diff --git a/assets/data/stash.clx b/assets/data/stash.clx index 7a9a1d529ad..aecca3c53e2 100644 Binary files a/assets/data/stash.clx and b/assets/data/stash.clx differ diff --git a/assets/data/stashnavbtns.clx b/assets/data/stashnavbtns.clx index 36f1fd88630..572a4a66653 100644 Binary files a/assets/data/stashnavbtns.clx and b/assets/data/stashnavbtns.clx differ diff --git a/assets/data/talkbutton.clx b/assets/data/talkbutton.clx index 0dee7d91774..c211c63d0d1 100644 Binary files a/assets/data/talkbutton.clx and b/assets/data/talkbutton.clx differ diff --git a/assets/data/xpbar.clx b/assets/data/xpbar.clx index 8dbb5d44918..eb79486db80 100644 Binary files a/assets/data/xpbar.clx and b/assets/data/xpbar.clx differ diff --git a/assets/fonts/12-00.clx b/assets/fonts/12-00.clx index bb17330b9ca..68ebe6d18c3 100644 Binary files a/assets/fonts/12-00.clx and b/assets/fonts/12-00.clx differ diff --git a/assets/fonts/12-01.clx b/assets/fonts/12-01.clx index ca1c5328858..b46d6a06572 100644 Binary files a/assets/fonts/12-01.clx and b/assets/fonts/12-01.clx differ diff --git a/assets/fonts/12-02.clx b/assets/fonts/12-02.clx index 5450d1de5cb..e4f715576c8 100644 Binary files a/assets/fonts/12-02.clx and b/assets/fonts/12-02.clx differ diff --git a/assets/fonts/12-03.clx b/assets/fonts/12-03.clx index 831a182950a..1fc8cbebf8b 100644 Binary files a/assets/fonts/12-03.clx and b/assets/fonts/12-03.clx differ diff --git a/assets/fonts/12-04.clx b/assets/fonts/12-04.clx index e8f12ba1cf0..4fce812d729 100644 Binary files a/assets/fonts/12-04.clx and b/assets/fonts/12-04.clx differ diff --git a/assets/fonts/12-1f1.clx b/assets/fonts/12-1f1.clx index 8a030b63fa0..2d1365de65e 100644 Binary files a/assets/fonts/12-1f1.clx and b/assets/fonts/12-1f1.clx differ diff --git a/assets/fonts/12-1f3.clx b/assets/fonts/12-1f3.clx index 267285f15f4..5c2aa84d05f 100644 Binary files a/assets/fonts/12-1f3.clx and b/assets/fonts/12-1f3.clx differ diff --git a/assets/fonts/12-1f4.clx b/assets/fonts/12-1f4.clx index e0e62f61c3a..3c8f26f66a9 100644 Binary files a/assets/fonts/12-1f4.clx and b/assets/fonts/12-1f4.clx differ diff --git a/assets/fonts/12-1f5.clx b/assets/fonts/12-1f5.clx index eb43ceab7ba..99cae94b69f 100644 Binary files a/assets/fonts/12-1f5.clx and b/assets/fonts/12-1f5.clx differ diff --git a/assets/fonts/12-1f6.clx b/assets/fonts/12-1f6.clx index 2d9edc4311b..39e3db04dd3 100644 Binary files a/assets/fonts/12-1f6.clx and b/assets/fonts/12-1f6.clx differ diff --git a/assets/fonts/12-1f9.clx b/assets/fonts/12-1f9.clx index 4769c3fdae1..17993a706be 100644 Binary files a/assets/fonts/12-1f9.clx and b/assets/fonts/12-1f9.clx differ diff --git a/assets/fonts/12-20.clx b/assets/fonts/12-20.clx index 16e277aca10..d4d07cd38f9 100644 Binary files a/assets/fonts/12-20.clx and b/assets/fonts/12-20.clx differ diff --git a/assets/fonts/12-26.clx b/assets/fonts/12-26.clx index 886491c8484..3f117506942 100644 Binary files a/assets/fonts/12-26.clx and b/assets/fonts/12-26.clx differ diff --git a/assets/fonts/12-e0.clx b/assets/fonts/12-e0.clx index ba865a2e94f..809f9545d24 100644 Binary files a/assets/fonts/12-e0.clx and b/assets/fonts/12-e0.clx differ diff --git a/assets/fonts/22-00.clx b/assets/fonts/22-00.clx index fe439cf7de5..c5f07141c43 100644 Binary files a/assets/fonts/22-00.clx and b/assets/fonts/22-00.clx differ diff --git a/assets/fonts/22-01.clx b/assets/fonts/22-01.clx index 0d08ec96e78..8cf42234ca0 100644 Binary files a/assets/fonts/22-01.clx and b/assets/fonts/22-01.clx differ diff --git a/assets/fonts/22-02.clx b/assets/fonts/22-02.clx index 2ae05e955fc..67b1337d711 100644 Binary files a/assets/fonts/22-02.clx and b/assets/fonts/22-02.clx differ diff --git a/assets/fonts/22-03.clx b/assets/fonts/22-03.clx index f3bfa08d6d1..9c85698e0c3 100644 Binary files a/assets/fonts/22-03.clx and b/assets/fonts/22-03.clx differ diff --git a/assets/fonts/22-04.clx b/assets/fonts/22-04.clx index 0deaa2fd0a7..efd561e03ed 100644 Binary files a/assets/fonts/22-04.clx and b/assets/fonts/22-04.clx differ diff --git a/assets/fonts/22-05.clx b/assets/fonts/22-05.clx index e9a00b4c9f3..b6f4685de82 100644 Binary files a/assets/fonts/22-05.clx and b/assets/fonts/22-05.clx differ diff --git a/assets/fonts/22-20.clx b/assets/fonts/22-20.clx index 2102f887b35..eda86e332b2 100644 Binary files a/assets/fonts/22-20.clx and b/assets/fonts/22-20.clx differ diff --git a/assets/fonts/24-00.clx b/assets/fonts/24-00.clx index bd19c59f3f1..a768656a801 100644 Binary files a/assets/fonts/24-00.clx and b/assets/fonts/24-00.clx differ diff --git a/assets/fonts/24-01.clx b/assets/fonts/24-01.clx index 2c5b319a8f6..a139f7aa307 100644 Binary files a/assets/fonts/24-01.clx and b/assets/fonts/24-01.clx differ diff --git a/assets/fonts/24-02.clx b/assets/fonts/24-02.clx index 5cca2a571f6..540ba568bb6 100644 Binary files a/assets/fonts/24-02.clx and b/assets/fonts/24-02.clx differ diff --git a/assets/fonts/24-03.clx b/assets/fonts/24-03.clx index f55ce856248..cbd4a80d95d 100644 Binary files a/assets/fonts/24-03.clx and b/assets/fonts/24-03.clx differ diff --git a/assets/fonts/24-04.clx b/assets/fonts/24-04.clx index f9b3adc34d5..6224effe557 100644 Binary files a/assets/fonts/24-04.clx and b/assets/fonts/24-04.clx differ diff --git a/assets/fonts/24-1f1.clx b/assets/fonts/24-1f1.clx index e24744633a5..4c29a2b2728 100644 Binary files a/assets/fonts/24-1f1.clx and b/assets/fonts/24-1f1.clx differ diff --git a/assets/fonts/24-1f3.clx b/assets/fonts/24-1f3.clx index 5e5a9ce851d..c44d2fc50f7 100644 Binary files a/assets/fonts/24-1f3.clx and b/assets/fonts/24-1f3.clx differ diff --git a/assets/fonts/24-1f4.clx b/assets/fonts/24-1f4.clx index dadbd87c013..69fe9a457b8 100644 Binary files a/assets/fonts/24-1f4.clx and b/assets/fonts/24-1f4.clx differ diff --git a/assets/fonts/24-1f5.clx b/assets/fonts/24-1f5.clx index 491a797bcb3..49b247c3c54 100644 Binary files a/assets/fonts/24-1f5.clx and b/assets/fonts/24-1f5.clx differ diff --git a/assets/fonts/24-1f6.clx b/assets/fonts/24-1f6.clx index 978776954c2..bd6354a2ba9 100644 Binary files a/assets/fonts/24-1f6.clx and b/assets/fonts/24-1f6.clx differ diff --git a/assets/fonts/24-1f9.clx b/assets/fonts/24-1f9.clx index 6945a8f6728..92bdf11230a 100644 Binary files a/assets/fonts/24-1f9.clx and b/assets/fonts/24-1f9.clx differ diff --git a/assets/fonts/24-20.clx b/assets/fonts/24-20.clx index 92bc422a5c2..d92b261cb1a 100644 Binary files a/assets/fonts/24-20.clx and b/assets/fonts/24-20.clx differ diff --git a/assets/fonts/24-26.clx b/assets/fonts/24-26.clx index 68ec7977c93..87e377cd156 100644 Binary files a/assets/fonts/24-26.clx and b/assets/fonts/24-26.clx differ diff --git a/assets/fonts/24-e0.clx b/assets/fonts/24-e0.clx index 78f557f40fb..e253478ad1c 100644 Binary files a/assets/fonts/24-e0.clx and b/assets/fonts/24-e0.clx differ diff --git a/assets/fonts/30-00.clx b/assets/fonts/30-00.clx index 8a3ad7a7874..c702fe0ea22 100644 Binary files a/assets/fonts/30-00.clx and b/assets/fonts/30-00.clx differ diff --git a/assets/fonts/30-01.clx b/assets/fonts/30-01.clx index f9fb30f5f42..73ce58b3774 100644 Binary files a/assets/fonts/30-01.clx and b/assets/fonts/30-01.clx differ diff --git a/assets/fonts/30-02.clx b/assets/fonts/30-02.clx index 93faff9d703..98cb333f686 100644 Binary files a/assets/fonts/30-02.clx and b/assets/fonts/30-02.clx differ diff --git a/assets/fonts/30-03.clx b/assets/fonts/30-03.clx index 710c5dad5ee..0f69c418307 100644 Binary files a/assets/fonts/30-03.clx and b/assets/fonts/30-03.clx differ diff --git a/assets/fonts/30-04.clx b/assets/fonts/30-04.clx index d63b76769d2..0f80489cb04 100644 Binary files a/assets/fonts/30-04.clx and b/assets/fonts/30-04.clx differ diff --git a/assets/fonts/30-20.clx b/assets/fonts/30-20.clx index 91bec561738..149713e77e9 100644 Binary files a/assets/fonts/30-20.clx and b/assets/fonts/30-20.clx differ diff --git a/assets/fonts/42-00.clx b/assets/fonts/42-00.clx index 296a7e095c9..5314eb00e42 100644 Binary files a/assets/fonts/42-00.clx and b/assets/fonts/42-00.clx differ diff --git a/assets/fonts/42-01.clx b/assets/fonts/42-01.clx index 2a37675ff31..4d7c2cd295f 100644 Binary files a/assets/fonts/42-01.clx and b/assets/fonts/42-01.clx differ diff --git a/assets/fonts/42-02.clx b/assets/fonts/42-02.clx index 32cbaebecc3..4ea69495040 100644 Binary files a/assets/fonts/42-02.clx and b/assets/fonts/42-02.clx differ diff --git a/assets/fonts/42-03.clx b/assets/fonts/42-03.clx index da6c4d69098..afaaaa96bd2 100644 Binary files a/assets/fonts/42-03.clx and b/assets/fonts/42-03.clx differ diff --git a/assets/fonts/42-04.clx b/assets/fonts/42-04.clx index 6b3fa7bece0..2db98bae88b 100644 Binary files a/assets/fonts/42-04.clx and b/assets/fonts/42-04.clx differ diff --git a/assets/fonts/42-20.clx b/assets/fonts/42-20.clx index 59a5f5785ff..44f57709219 100644 Binary files a/assets/fonts/42-20.clx and b/assets/fonts/42-20.clx differ diff --git a/assets/fonts/46-00.clx b/assets/fonts/46-00.clx index b35fb235900..c815577d3a6 100644 Binary files a/assets/fonts/46-00.clx and b/assets/fonts/46-00.clx differ diff --git a/assets/fonts/46-01.clx b/assets/fonts/46-01.clx index 86b3501a32e..5bba2f76fd4 100644 Binary files a/assets/fonts/46-01.clx and b/assets/fonts/46-01.clx differ diff --git a/assets/fonts/46-02.clx b/assets/fonts/46-02.clx index f00d785e41d..3fdc54c2f70 100644 Binary files a/assets/fonts/46-02.clx and b/assets/fonts/46-02.clx differ diff --git a/assets/fonts/46-03.clx b/assets/fonts/46-03.clx index b412cdd433b..426178f8ef1 100644 Binary files a/assets/fonts/46-03.clx and b/assets/fonts/46-03.clx differ diff --git a/assets/fonts/46-04.clx b/assets/fonts/46-04.clx index 660a859c0e9..4f08248aaa3 100644 Binary files a/assets/fonts/46-04.clx and b/assets/fonts/46-04.clx differ diff --git a/assets/fonts/46-20.clx b/assets/fonts/46-20.clx index ea33fc94790..d69b91e73ef 100644 Binary files a/assets/fonts/46-20.clx and b/assets/fonts/46-20.clx differ diff --git a/assets/fonts/tr/12-00.clx b/assets/fonts/tr/12-00.clx index 9d9809113a2..6f082c46f77 100644 Binary files a/assets/fonts/tr/12-00.clx and b/assets/fonts/tr/12-00.clx differ diff --git a/assets/fonts/tr/24-00.clx b/assets/fonts/tr/24-00.clx index d92e596bf4a..257e9023b0c 100644 Binary files a/assets/fonts/tr/24-00.clx and b/assets/fonts/tr/24-00.clx differ diff --git a/assets/fonts/tr/30-00.clx b/assets/fonts/tr/30-00.clx index ff4810f5e1f..e1d532c56e6 100644 Binary files a/assets/fonts/tr/30-00.clx and b/assets/fonts/tr/30-00.clx differ diff --git a/assets/fonts/tr/42-00.clx b/assets/fonts/tr/42-00.clx index eefde96657b..91fe8f15c03 100644 Binary files a/assets/fonts/tr/42-00.clx and b/assets/fonts/tr/42-00.clx differ diff --git a/assets/fonts/tr/46-00.clx b/assets/fonts/tr/46-00.clx index a722aa14d09..e2c584b1ecd 100644 Binary files a/assets/fonts/tr/46-00.clx and b/assets/fonts/tr/46-00.clx differ diff --git a/assets/gendata/cut2w.clx b/assets/gendata/cut2w.clx index c6a8a47d758..2626e4b9abd 100644 Binary files a/assets/gendata/cut2w.clx and b/assets/gendata/cut2w.clx differ diff --git a/assets/gendata/cut3w.clx b/assets/gendata/cut3w.clx index 5c2b1c8b771..b07f972a717 100644 Binary files a/assets/gendata/cut3w.clx and b/assets/gendata/cut3w.clx differ diff --git a/assets/gendata/cut4w.clx b/assets/gendata/cut4w.clx index bc2c692b13d..93ee0d539a2 100644 Binary files a/assets/gendata/cut4w.clx and b/assets/gendata/cut4w.clx differ diff --git a/assets/gendata/cutgatew.clx b/assets/gendata/cutgatew.clx index 20b81a34d61..6148445e1cf 100644 Binary files a/assets/gendata/cutgatew.clx and b/assets/gendata/cutgatew.clx differ diff --git a/assets/gendata/cutl1dw.clx b/assets/gendata/cutl1dw.clx index a10faec8293..f0c9b7ecec3 100644 Binary files a/assets/gendata/cutl1dw.clx and b/assets/gendata/cutl1dw.clx differ diff --git a/assets/gendata/cutportlw.clx b/assets/gendata/cutportlw.clx index d3a03387dda..f183916a00e 100644 Binary files a/assets/gendata/cutportlw.clx and b/assets/gendata/cutportlw.clx differ diff --git a/assets/gendata/cutportrw.clx b/assets/gendata/cutportrw.clx index 69d7538e713..d2fec4be627 100644 Binary files a/assets/gendata/cutportrw.clx and b/assets/gendata/cutportrw.clx differ diff --git a/assets/gendata/cutstartw.clx b/assets/gendata/cutstartw.clx index 02eed28372f..649255cb3be 100644 Binary files a/assets/gendata/cutstartw.clx and b/assets/gendata/cutstartw.clx differ diff --git a/assets/gendata/cutttw.clx b/assets/gendata/cutttw.clx index 2b7bc7ca576..7733c593e67 100644 Binary files a/assets/gendata/cutttw.clx and b/assets/gendata/cutttw.clx differ diff --git a/assets/ui_art/creditsw.clx b/assets/ui_art/creditsw.clx index da53c3822eb..f2f7146bddb 100644 Binary files a/assets/ui_art/creditsw.clx and b/assets/ui_art/creditsw.clx differ diff --git a/assets/ui_art/dvl_but_sml.clx b/assets/ui_art/dvl_but_sml.clx index 582856a6097..97548ce5c73 100644 Binary files a/assets/ui_art/dvl_but_sml.clx and b/assets/ui_art/dvl_but_sml.clx differ diff --git a/assets/ui_art/dvl_lrpopup.clx b/assets/ui_art/dvl_lrpopup.clx index c634b75c795..5abc5488d54 100644 Binary files a/assets/ui_art/dvl_lrpopup.clx and b/assets/ui_art/dvl_lrpopup.clx differ diff --git a/assets/ui_art/hf_titlew.clx b/assets/ui_art/hf_titlew.clx index bef879e5211..103ed9cb52f 100644 Binary files a/assets/ui_art/hf_titlew.clx and b/assets/ui_art/hf_titlew.clx differ diff --git a/assets/ui_art/mainmenuw.clx b/assets/ui_art/mainmenuw.clx index a9b690bd700..576d8c3591e 100644 Binary files a/assets/ui_art/mainmenuw.clx and b/assets/ui_art/mainmenuw.clx differ diff --git a/assets/ui_art/supportw.clx b/assets/ui_art/supportw.clx index f0b302db37e..00efa1a2c53 100644 Binary files a/assets/ui_art/supportw.clx and b/assets/ui_art/supportw.clx differ