Adapt dll to 1.33.3

matanki-saito · Apr 9, 2022 · e791431 · e791431
1 parent 640dd90
commit e791431
Show file tree

Hide file tree

Showing 21 changed files with 491 additions and 29 deletions.
diff --git a/Plugin64/date.cpp b/Plugin64/date.cpp
@@ -36,6 +36,7 @@ namespace Date {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// d w mw w y
 			BytePattern::temp_instance().find_pattern("64 20 77 20 6D");
 			if (BytePattern::temp_instance().has_size(1, u8"右上の表記を変更")) {

diff --git a/Plugin64/dll_main.cpp b/Plugin64/dll_main.cpp
@@ -29,11 +29,6 @@ BOOL APIENTRY DllMain(HMODULE hModule,
 			e |= ModDownload::Init();
 			#endif
 
-			// デバッグ用
-			//#ifdef _DEBUG
-			//e |= Debug::Init(options);
-			//#endif
-
 			// フォント読み込み
 			e |= Font::Init(options);
 

diff --git a/Plugin64/event_dialog.cpp b/Plugin64/event_dialog.cpp
@@ -50,6 +50,7 @@ namespace EventDialog {
 			break;
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movzx   eax, byte ptr [rdx+rax]
 			BytePattern::temp_instance().find_pattern("0F B6 04 02 49 8B 34 C2 F3 41 0F 10 8A 48 08 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"文字取得処理")) {
@@ -115,6 +116,7 @@ namespace EventDialog {
 			break;
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     rax, [rsp+1158h+arg_20]
 			BytePattern::temp_instance().find_pattern("48 8B 84 24 80 11 00 00 8B 00 03 C0");
 			if (BytePattern::temp_instance().has_size(1, u8"分岐処理修正戻り先アドレス２")) {
@@ -193,6 +195,7 @@ namespace EventDialog {
 			break;
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// inc     edi
 			BytePattern::temp_instance().find_pattern("FF C7 3B 7B 10 44 8B 84 24 70 11 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"カウントアップ")) {

diff --git a/Plugin64/file_save.cpp b/Plugin64/file_save.cpp
@@ -56,6 +56,7 @@ namespace FileSave {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     eax, [rcx+10h]
 			BytePattern::temp_instance().find_pattern("8B 41 10 85 C0 0F 84 31 01 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"ファイル名を安全にしている場所を短絡する")) {
@@ -82,6 +83,7 @@ namespace FileSave {
 		int offset = 0;
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -192,6 +194,7 @@ namespace FileSave {
 				e.fileSave.unmatchdFileSaveProc3Injector = true;
 			}
 			break;
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -241,6 +244,7 @@ namespace FileSave {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// lea     r8, [rbp+0]
 			BytePattern::temp_instance().find_pattern("4C 8D 45 00 48 8D 15 ? ? ? ? 48 8D 4C 24 70 E8 ? ? ? ? 90");
 			if (BytePattern::temp_instance().has_size(1, u8"ダイアログでのセーブエントリのツールチップを表示できるようにする1")) {
@@ -323,6 +327,7 @@ namespace FileSave {
 				e.fileSave.unmatchdFileSaveProc5Injector = true;
 			}
 			break;
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -390,6 +395,7 @@ namespace FileSave {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// lea     r8, [rbp+730h+var_3A0]
 			BytePattern::temp_instance().find_pattern("4C 8D 85 90 03 00 00 48 8D 15 ? ? ? ? 48 8D 4C 24 30");
 			if (BytePattern::temp_instance().has_size(1, u8"スタート画面でのコンティニューのツールチップ")) {
@@ -451,6 +457,7 @@ namespace FileSave {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// lea     rcx, [rbx+0C8h]
 			uintptr_t address;
 

diff --git a/Plugin64/font.cpp b/Plugin64/font.cpp
@@ -35,6 +35,7 @@ namespace Font {
 			break;
 
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// cmp     edi, 0FFh
 			// 81 FF FF 00 00 00
 			BytePattern::temp_instance().find_pattern("81 FF FF 00 00 00 0F 87 2C 01 00 00 83");
@@ -75,6 +76,7 @@ namespace Font {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov rcx,cs:hHeap
 			BytePattern::temp_instance().find_pattern("48 8B 0D ? ? ? ? 4C 8B C3 33 D2");
 			if (BytePattern::temp_instance().has_size(1, "Font buffer heap zero clear")) {
@@ -121,6 +123,7 @@ namespace Font {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			BytePattern::temp_instance().find_pattern("BA 88 3D 00 00 48 8B CF");
 			if (BytePattern::temp_instance().has_size(1, "Font buffer clear")) {
 				// mov edx, 3D88h
@@ -159,6 +162,7 @@ namespace Font {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			BytePattern::temp_instance().find_pattern("BA 88 3D 00 00 48 8B 4D 28");
 			if (BytePattern::temp_instance().has_size(1, "Font buffer clear")) {
 				// mov edx, 3D88h
@@ -197,6 +201,7 @@ namespace Font {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			BytePattern::temp_instance().find_pattern("B9 88 3D 00 00");
 			if (BytePattern::temp_instance().has_size(1, "Font buffer expansion")) {
 				// mov ecx, 3D88h
@@ -234,6 +239,7 @@ namespace Font {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			BytePattern::temp_instance().find_pattern("41 81 FE 00 00 00 01");
 			if (BytePattern::temp_instance().has_size(1, u8"Font size limit")) {
 				// cmp r14d, 1000000h

diff --git a/Plugin64/ime.cpp b/Plugin64/ime.cpp
@@ -53,6 +53,7 @@ namespace Ime {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     edx, r13d
 			BytePattern::temp_instance().find_pattern("41 8B D5 49 8B CC E8 ? ? ? ? 85 C0 0F 85");
 			if (BytePattern::temp_instance().has_size(1, u8"SDL_windowsevents.cの修正")) {
@@ -105,6 +106,7 @@ namespace Ime {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			rectAddress = (uintptr_t)&rect;
 
 			// SDL_SetTextInputRectの関数を見つける
@@ -190,6 +192,7 @@ namespace Ime {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// 直前の部分でjmpに使う14byteを確保することができなかった。
 			// そのためWM_KEYDOWNのコードをすべて移植した
 			// mov     rcx, [rbp+0C0h+hRawInput]

diff --git a/Plugin64/input.cpp b/Plugin64/input.cpp
@@ -62,6 +62,7 @@ namespace Input {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     eax, dword ptr	[rbp+120h+var_18C]
 			BytePattern::temp_instance().find_pattern("8B 45 94 32 DB 3C 80 73 05 0F B6 D8 EB 10");
 			if (BytePattern::temp_instance().has_size(1, u8"入力した文字をutf8からエスケープ列へ変換する１")) {
@@ -116,6 +117,7 @@ namespace Input {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     rax, [rdi]
 			BytePattern::temp_instance().find_pattern("48 8B 07 48 8B CF 85 DB 74 08 FF 90 40 01 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"バックスペース処理の修正")) {

diff --git a/Plugin64/list_field_adjustment.cpp b/Plugin64/list_field_adjustment.cpp
@@ -21,6 +21,7 @@ namespace ListFieldAdjustment {
 		DllError e = {};
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -90,6 +91,7 @@ namespace ListFieldAdjustment {
 		DllError e = {};
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -163,6 +165,7 @@ namespace ListFieldAdjustment {
 		DllError e = {};
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:

diff --git a/Plugin64/localization.cpp b/Plugin64/localization.cpp
@@ -54,6 +54,7 @@ namespace Localization {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     [rsp+arg_10], rbx
 			BytePattern::temp_instance().find_pattern("48 89 5C 24 18 55 41 56 41 57 48 83 EC 20 4D 8B F0");
 			if (BytePattern::temp_instance().has_size(1, u8"std::basic_string<char>#insertをフック")) {
@@ -118,6 +119,7 @@ namespace Localization {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// mov     rax, [rdi+30h]
 			BytePattern::temp_instance().find_pattern("48 8B 47 30 4C 8B 40 28 49 83 C0 10");
 			if (BytePattern::temp_instance().has_size(1, u8"Battle of areaを逆転させる")) {
@@ -163,6 +165,7 @@ namespace Localization {
 				e.localization.unmatchdLocalizationProc3Injector = true;
 			}
 			break;
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -233,6 +236,7 @@ namespace Localization {
 				e.localization.unmatchdLocalizationProc4Injector = true;
 			}
 			break;
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 			offset = 0x3C;
@@ -311,6 +315,7 @@ namespace Localization {
 		int offset = 0;
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -395,6 +400,7 @@ namespace Localization {
 		int offset = 0;
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 			/* 処理は不要になった。tmm_l_english.ymlのLONG_EU3_DATE_STRINGで代用される*/
 			break;
@@ -460,6 +466,7 @@ namespace Localization {
 		std::string pattern;
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -515,6 +522,7 @@ namespace Localization {
 		std::string pattern;
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:
@@ -569,6 +577,7 @@ namespace Localization {
 		DllError e = {};
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 		case v1_31_6_0:

diff --git a/Plugin64/main_text.cpp b/Plugin64/main_text.cpp
@@ -37,6 +37,7 @@ namespace MainText {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movsxd rax, edi
 			BytePattern::temp_instance().find_pattern("48 63 C7 0F B6 04 18 F3 41 0F 10 9F 48 08 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"テキスト処理ループ２の文字取得修正")) {
@@ -70,6 +71,7 @@ namespace MainText {
 		case v1_31_3_0:
 		case v1_31_2_0:
 		case v1_31_1_0:
+		case v1_33_3_0:
 			// movsxd rdx, edi
 			BytePattern::temp_instance().find_pattern("48 63 D7 49 63 CE 4C 8B 55 80");
 			if (BytePattern::temp_instance().has_size(1, u8"テキスト処理ループ１のカウント処理修正")) {
@@ -124,6 +126,7 @@ namespace MainText {
 		DllError e = {};
 
 		switch (options.version) {
+		case v1_33_3_0:
 		case v1_33_0_0:
 		case v1_32_0_1:
 			// cmp cs:byte_xxxxx, 0
@@ -239,6 +242,7 @@ namespace MainText {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movzx eax, byte ptr [rdx+r10]
 			BytePattern::temp_instance().find_pattern("42 0F B6 04 12 49 8B 0C C7");
 			if (BytePattern::temp_instance().has_size(1, u8"テキスト処理ループ１の文字取得修正")) {

diff --git a/Plugin64/map_adjustment.cpp b/Plugin64/map_adjustment.cpp
@@ -62,6 +62,7 @@ namespace MapAdjustment {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movsx ecx, byte ptr [rdi + rbx]
 			BytePattern::temp_instance().find_pattern("0F BE 0C 1F E8 ? ? ? ? 88 04 1F 41 FF");
 			if (BytePattern::temp_instance().has_size(2, u8"マップ文字の大文字化キャンセル")) {
@@ -135,6 +136,7 @@ namespace MapAdjustment {
 			break;
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// lea     rax, [rbp+200h+var_200]
 			BytePattern::temp_instance().find_pattern("48 8D 45 00 49 83 C8 FF 90 49 FF C0");
 			if (BytePattern::temp_instance().has_size(1, u8"文字チェック修正") ||
@@ -201,6 +203,7 @@ namespace MapAdjustment {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// r9, 0FFFFFFFFFFFFFFFFh
 			BytePattern::temp_instance().find_pattern("49 83 C9 FF 45 33 C0 48 8D 95 D0 00 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"文字チェックの後のコピー処理")) {
@@ -266,6 +269,7 @@ namespace MapAdjustment {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			//  lea     rax, [rbp+200h+var_160]
 			BytePattern::temp_instance().find_pattern("48 8D 85 A0 00 00 00 49 83 F8 10");
 			if (BytePattern::temp_instance().has_size(1, u8"文字取得処理修正")) {
@@ -335,6 +339,7 @@ namespace MapAdjustment {
 			break;
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// localization/tmm_l_english.ymlのENCLAVE_NAME_FORMATで対応された
 			break;
 

diff --git a/Plugin64/map_justify.cpp b/Plugin64/map_justify.cpp
@@ -33,6 +33,7 @@ namespace MapJustify {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movsd   xmm3, [rbp+1D0h+var_168]
 			BytePattern::temp_instance().find_pattern("F2 0F 10 5D 68 FF C2 F2 0F 10 65 20");
 			if (BytePattern::temp_instance().has_size(1, u8"文字取得処理リターン先２")) {
@@ -84,6 +85,7 @@ namespace MapJustify {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// lea     eax, [r10-1]
 			BytePattern::temp_instance().find_pattern("41 8D 42 FF 66 0F 6E F2 66 0F 6E C0");
 			if (BytePattern::temp_instance().has_size(1, u8"一文字表示の調整")) {
@@ -126,6 +128,7 @@ namespace MapJustify {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			// movsd   xmm3, [rbp+1D0h+var_168]
 			BytePattern::temp_instance().find_pattern("F2 0F 10 5D 68 FF C2 F2 0F 10 65 20");
 			if (BytePattern::temp_instance().has_size(1, u8"カウント処理")) {

diff --git a/Plugin64/map_nudge_view.cpp b/Plugin64/map_nudge_view.cpp
@@ -42,6 +42,7 @@ namespace MapNudgeView {
 		case v1_31_6_0:
 		case v1_32_0_1:
 		case v1_33_0_0:
+		case v1_33_3_0:
 			//  movzx   eax, byte ptr [rax+rcx]
 			BytePattern::temp_instance().find_pattern("0F B6 04 08 49 8B 94 C4 20 01 00 00");
 			if (BytePattern::temp_instance().has_size(1, u8"nudge view")) {