diff --git a/cpp/LunaHook/LunaHook/engine64/yuzu.cpp b/cpp/LunaHook/LunaHook/engine64/yuzu.cpp
index 700300ea..87c11b52 100644
--- a/cpp/LunaHook/LunaHook/engine64/yuzu.cpp
+++ b/cpp/LunaHook/LunaHook/engine64/yuzu.cpp
@@ -129,6 +129,7 @@ bool Hook_Network_RoomMember_SendGameInfo()
                 << std::setfill('0')
                 << game_info.id;
             ConsoleOutput("%s %s %s", game_info.name.c_str(), num.str().c_str(), game_info.version.c_str());
+            jitaddrclear();
         };
         return NewHook(hp, "yuzuGameInfo");
     }
@@ -652,6 +653,15 @@ namespace
         buffer->from(s);
     }
 
+    void F01004EB01A328000(TextBuffer *buffer, HookParam *hp)
+    {
+        StringFilter(buffer, "#n", 2);
+        char name[] = u8"雪村";
+        StringReplacer(buffer, "#Name[1]", 8, name, strlen(name));
+        auto s = buffer->strA();
+        s = std::regex_replace(s, std::regex(R"(#Color\[\d+?\])"), "");
+        buffer->from(s);
+    }
     void F010001D015260000(TextBuffer *buffer, HookParam *hp)
     {
         auto s = buffer->viewA();
@@ -659,10 +669,6 @@ namespace
             return buffer->clear();
         StringFilter(buffer, "#n", 2);
     }
-    void F010035001D1B2000(TextBuffer *buffer, HookParam *hp)
-    {
-        StringFilter(buffer, "#n", 2);
-    }
     void F0100E1E00E2AE000(TextBuffer *buffer, HookParam *hp)
     {
         auto s = buffer->strA();
@@ -1750,7 +1756,7 @@ namespace
         strReplace(s, "#n", "");
         strReplace(s, "\x81\x40", "");
         s = std::regex_replace(s, std::regex(R"(#Ruby\[(.*?),(.*?)\])"), "$1");
-        s = std::regex_replace(s, std::regex(R"(#(\w+?)\[[\d,]+?\])"), ""); // #Pos[0,42]#Speed[5]#Effect[0]#Scale[1]
+        s = std::regex_replace(s, std::regex(R"(#(\w+?)\[[\d,\.]+?\])"), ""); // #Pos[0,42]#Speed[5]#Effect[0]#Scale[1] #Scale[0.9]
         buffer->from(s);
     }
     void F01008BA00F172000(TextBuffer *buffer, HookParam *hp)
@@ -2412,8 +2418,20 @@ namespace
             {0x80008d88, {CODEC_UTF16, 0, 0, ReadTextAndLenDW<1>, F01006F000B056000, "01006F000B056000", "1.0.1"}}, // Location
             // Norn9 Var Commons
             {0x8003E874, {CODEC_UTF8, 0, 0, 0, F0100068019996000, "0100068019996000", "1.0.0"}}, // English
+            // 薄桜鬼 真改 遊戯録　隊士達の大宴会 for Nintendo Switch   三合一
+            {0x80016730, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其一
+            {0x8013AAA0, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其二
+            {0x8009C8A0, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其三
+            {0x800167B0, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其一
+            {0x8013AFA0, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其二
+            {0x8009CCE0, {CODEC_UTF8, 0, 0, 0, F01002BB00A662000, "010046601C024000", "1.0.0"}}, // name+text 其三
+            // 薄桜鬼SSL ～sweet school life～ for Nintendo Switch
+            {0x8004E71C, {CODEC_UTF8, 1, 0, 0, F01004EB01A328000, "01004EB01A328000", "1.0.0"}},
+            {0x8004EAEC, {CODEC_UTF8, 1, 0, 0, F01004EB01A328000, "01004EB01A328000", "1.0.1"}},
             // 薄桜鬼 真改 万葉ノ抄
             {0x8004E8F0, {CODEC_UTF8, 1, 0, 0, F010001D015260000, "0100EA601A0A0000", "1.0.0"}},
+            // 薄桜鬼 真改 天雲ノ抄
+            {0x8004CACC, {CODEC_UTF8, 1, 0, 0, F010001D015260000, "0100997017690000", "1.0.0"}},
             // 薄桜鬼 真改 銀星ノ抄
             {0x80047F00, {CODEC_UTF8, 1, 0, 0, F010001D015260000, "0100C49010598000", "1.0.0"}},
             // 薄桜鬼 真改 月影ノ抄
@@ -3343,8 +3361,8 @@ namespace
             {0x800C43D4, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.0"}}, // text
             {0x800C4468, {0, 0, 0, 0, F0100509013040000, "0100509013040000", "1.0.1"}}, // text
             // 猛獣たちとお姫様 for Nintendo Switch  二合一
-            {0x80115C70, {CODEC_UTF8, 0, 0, 0, F010035001D1B2000, "010035001D1B2000", "1.0.0"}}, // text
-            {0x80115F20, {CODEC_UTF8, 0, 0, 0, F010035001D1B2000, "010035001D1B2000", "1.0.1"}}, // text
+            {0x80115C70, {CODEC_UTF8, 0, 0, 0, F010001D015260000, "010035001D1B2000", "1.0.0"}}, // text
+            {0x80115F20, {CODEC_UTF8, 0, 0, 0, F010001D015260000, "010035001D1B2000", "1.0.1"}}, // text
         };
         return 1;
     }();
diff --git a/cpp/LunaHook/LunaHook/main.cc b/cpp/LunaHook/LunaHook/main.cc
index 7265ff2e..46dce192 100644
--- a/cpp/LunaHook/LunaHook/main.cc
+++ b/cpp/LunaHook/LunaHook/main.cc
@@ -223,6 +223,12 @@ int HookStrLen(HookParam *hp, BYTE *data)
 		return strnlen((char *)data, TEXT_BUFFER_SIZE);
 }
 static std::mutex maplock;
+void jitaddrclear()
+{
+	std::lock_guard _(maplock);
+	emuaddr2jitaddr.clear();
+	jitaddr2emuaddr.clear();
+}
 void jitaddraddr(uint64_t em_addr, uintptr_t jitaddr, JITTYPE jittype)
 {
 	std::lock_guard _(maplock);
diff --git a/cpp/LunaHook/LunaHook/main.h b/cpp/LunaHook/LunaHook/main.h
index c3268fe2..5ebab40e 100644
--- a/cpp/LunaHook/LunaHook/main.h
+++ b/cpp/LunaHook/LunaHook/main.h
@@ -23,6 +23,7 @@ int HookStrLen(HookParam *, BYTE *data);
 extern std::unordered_map<uint64_t, std::pair<JITTYPE, uintptr_t>> emuaddr2jitaddr;
 extern std::unordered_map<uintptr_t, std::pair<JITTYPE, uint64_t>> jitaddr2emuaddr;
 void jitaddraddr(uint64_t em_addr, uintptr_t jitaddr, JITTYPE);
+void jitaddrclear();
 
 void context_get(hook_stack *, PCONTEXT);
 void context_set(hook_stack *, PCONTEXT);