From 0d4893c4485a007f147f83128416124e7a91ef6a Mon Sep 17 00:00:00 2001
From: Billy Laws <blaws05@gmail.com>
Date: Thu, 22 Sep 2022 21:32:54 +0100
Subject: [PATCH] Cleanup font magic generation code

---
 app/src/main/cpp/skyline/services/pl/shared_font_core.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/src/main/cpp/skyline/services/pl/shared_font_core.h b/app/src/main/cpp/skyline/services/pl/shared_font_core.h
index 41a0f271..32be9864 100644
--- a/app/src/main/cpp/skyline/services/pl/shared_font_core.h
+++ b/app/src/main/cpp/skyline/services/pl/shared_font_core.h
@@ -40,10 +40,6 @@ namespace skyline::service::pl {
             auto fontsDirectory{std::make_shared<vfs::OsFileSystem>(state.os->publicAppFilesPath + "fonts/")};
             auto ptr{reinterpret_cast<u32 *>(sharedFontMemory->host.data())};
             for (auto &font : fonts) {
-                *ptr++ = 0x18029a7f;
-                *ptr++ = util::SwapEndianness(font.length ^ 0x49621806);
-                font.offset = static_cast<u32>(reinterpret_cast<uintptr_t>(ptr) - reinterpret_cast<uintptr_t>(sharedFontMemory->host.data()));
-
                 std::shared_ptr<vfs::Backing> fontFile;
                 if (fontsDirectory->FileExists(font.path))
                     fontFile = fontsDirectory->OpenFile(font.path);
@@ -51,6 +47,10 @@ namespace skyline::service::pl {
                     fontFile = state.os->assetFileSystem->OpenFile("fonts/" + font.path);
 
                 font.length = static_cast<u32>(fontFile->size);
+
+                *ptr++ = util::SwapEndianness(SharedFontResult);
+                *ptr++ = util::SwapEndianness(font.length ^ SharedFontKey);
+                font.offset = static_cast<u32>(reinterpret_cast<uintptr_t>(ptr) - reinterpret_cast<uintptr_t>(sharedFontMemory->host.data()));
                 fontFile->Read(span<u8>(reinterpret_cast<u8 *>(ptr), font.length));
                 ptr = reinterpret_cast<u32 *>(reinterpret_cast<u8 *>(ptr) + font.length);
             }