From 16d4c8e1e1ee40da5acd0bbb432c874d6469e6e5 Mon Sep 17 00:00:00 2001
From: Maki <marcingomulak@gmail.com>
Date: Thu, 22 Aug 2024 11:02:04 +0200
Subject: [PATCH] JP added Character blink fix address

---
 ff8_demaster/dllmain.cpp          | 12 +++++++-----
 ff8_demaster/ff8_demaster.vcxproj |  4 ++--
 ff8_demaster/mymemory.h           |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/ff8_demaster/dllmain.cpp b/ff8_demaster/dllmain.cpp
index af4aa7a..778bca9 100644
--- a/ff8_demaster/dllmain.cpp
+++ b/ff8_demaster/dllmain.cpp
@@ -55,11 +55,13 @@ void*  HookGlfwSetWindowHint(int hint, int value)
 	
 	if(WINDOW_OVERWRITE)
 	{
-		static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_VERSION_MAJOR, 3);
-		static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_VERSION_MINOR, 3);
-		static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
-		static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
-		static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE);
+		if(hint == GLFW_DECORATED)
+			newValue = GLFW_TRUE;
+		//static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_VERSION_MAJOR, 3);
+		//static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_VERSION_MINOR, 3);
+		//static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
+		//static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_OPENGL_FORWARD_COMPAT, GLFW_TRUE);
+		//static_cast<void* (*)(GLenum, GLuint)>(oGlfwSetWindowHint)(GLFW_CONTEXT_NO_ERROR, GLFW_TRUE);
 
 		
 		// ModPage(0x1156E0E5, 1);
diff --git a/ff8_demaster/ff8_demaster.vcxproj b/ff8_demaster/ff8_demaster.vcxproj
index 4ae791c..5e14ca1 100644
--- a/ff8_demaster/ff8_demaster.vcxproj
+++ b/ff8_demaster/ff8_demaster.vcxproj
@@ -106,7 +106,7 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NOMINMAX;GLEW_STATIC;WIN32;_WIN32;_DEBUG;FF8DEMASTER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;USE_SERVER=1;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;GLEW_STATIC;WIN32;_WIN32;_DEBUG;FF8DEMASTER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;USE_SERVER=0;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>Default</ConformanceMode>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
@@ -170,7 +170,7 @@ del $(SolutionDir).dist\$(Configuration)\$(AssemblyName).lib</Command>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>NOMINMAX;GLEW_STATIC;WIN32;_DEBUG;FF8DEMASTER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;JAPANESE_PATCH=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>NOMINMAX;GLEW_STATIC;WIN32;_DEBUG;FF8DEMASTER_EXPORTS;_WINDOWS;_USRDLL;_CRT_SECURE_NO_WARNINGS;JAPANESE_PATCH=1;USE_SERVER=0;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>
       </PrecompiledHeaderFile>
diff --git a/ff8_demaster/mymemory.h b/ff8_demaster/mymemory.h
index d04e606..1f8f0cc 100644
--- a/ff8_demaster/mymemory.h
+++ b/ff8_demaster/mymemory.h
@@ -172,7 +172,7 @@ const std::map<ADDRESS_NAME, std::vector<unsigned int>> PATCHADDRESS =
 {BGFILENAME2          , std::vector<unsigned int>{ 0x0 , 0x0 , 0x18A85A4 , 0x18A8418 }},
 { CHANGEMODE      , std::vector<unsigned int>{ 0x0       , 0x0 , 0x0 ,0x16327C0,} }, //+1FC for JP and EFIGS
 { STEAMADDR      , std::vector<unsigned int>{ 0x0       , 0x0 , 0x0 ,0x16FED48,} }, //+1FC for JP and EFIGS
-{ FIELD_CHAR_BLINK      , std::vector<unsigned int>{ 0x0       , 0x0 , 0x0 ,0x0,} }, //TODO
+{ FIELD_CHAR_BLINK      , std::vector<unsigned int>{ 0x0       , 0x0 , 0x0 ,0x1637192,} }, //TODO
 #endif
 };