From 48eddadcd734e23bf382041044abdfbbd8a4dc76 Mon Sep 17 00:00:00 2001 From: dazedanon Date: Tue, 20 May 2025 13:48:39 -0500 Subject: [PATCH] Fix demons/humans branch --- Data/BasicData/CommonEvent.dat | Bin 2688622 -> 2688651 bytes DataTL/dump/common/222_text_if判定.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Data/BasicData/CommonEvent.dat b/Data/BasicData/CommonEvent.dat index bdc27d62ecfae7d9f661a4faec639504bef8f418..ac2dc1e404ae8997c9b1011c8f460ac182dd719c 100644 GIT binary patch delta 6107 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 Q6%i+*v9D-Rymj{f0EmOVI{*Lx diff --git a/DataTL/dump/common/222_text_if判定.json b/DataTL/dump/common/222_text_if判定.json index ca2d6773..a947fb87 100644 --- a/DataTL/dump/common/222_text_if判定.json +++ b/DataTL/dump/common/222_text_if判定.json @@ -276,8 +276,8 @@ "code": 122, "codeStr": "SetString", "stringArgs": [ - "Humans", - "No Demons" + "人間の場合", + "魔物の場合無し" ], "intArgs": [ 1600005,