update for 1.0.2.0 stable

Author: makipl

ff8_demaster/ff8_demaster.vcxproj

@@ -48,7 +48,7 @@
       </PrecompiledHeaderFile>
       <InlineFunctionExpansion>Disabled</InlineFunctionExpansion>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <LanguageStandard>stdcpp20</LanguageStandard>
+      <LanguageStandard>stdcpp17</LanguageStandard>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>

ff8_demaster/mymemory.h

@@ -57,7 +57,7 @@ const std::map<ADDRESS_NAME, std::vector<unsigned int>> PATCHADDRESS =
 {_ASM_FIELDBGRETADDR3 , std::vector<unsigned int>{ 0x0       , 0x1591B75 , 0x1592185 }},
 {DISABLETPAGELIMIT    , std::vector<unsigned int>{ 0x0       , 0x1606595 , 0x1606e75 }},
 {_ASM_FIELDBGRETADDR2 , std::vector<unsigned int>{ 0x0       , 0x1606540 , 0x1606e20 }},
-{DS_FREE              , std::vector<unsigned int>{ 0x0       , 0x166b2a8 , 0x166b2a4 }},
+{DS_FREE              , std::vector<unsigned int>{ 0x0       , 0x166b2a8 , 0x166b2a8 }},
 {DS_TEXIMG            , std::vector<unsigned int>{ 0x0       , 0x166b4a0 , 0x166b4b4 }},
 {_BSPBACKADD1         , std::vector<unsigned int>{ 0x0       , 0x1573AFF , 0x1573f7f }},
 {_BSPBACKADD2         , std::vector<unsigned int>{ 0x0       , 0x1573B54 , 0x1573fd4 }},

ff8_demaster/texturepatch_v2.cpp

@@ -48,12 +48,15 @@ __declspec(naked) void _cltObtainTexHeader()
 
 		//ORIGINAL CODE
 		PUSH ECX
+		PUSH EDX //this one gets cleared after 1020
 		PUSH UPLOADVRAM
 		CALL GetAddress
+
 		MOV ECX, EAX
 		MOV EAX, OFFSET IMAGE_BASE
 		MOV EAX, [EAX]
 		ADD EAX, ECX //upload_texture_vram
+		POP EDX
 		POP ECX
 		CALL EAX
 

ff8_demaster/texturepatch_v2_battleScenery.cpp

@@ -235,32 +235,35 @@ __declspec(naked) void _bsp()
 		JMP _bspBackAdd1
 
 			_wtpOk :
-		MOV EAX, OFFSET IMAGE_BASE
-			MOV EAX, [EAX]
-			PUSH EAX
-			PUSH DS_FREE
-			CALL GetAddress
-			MOV EBX, EAX
-			POP EAX
-			ADD EAX, EBX
+		//MOV EAX, OFFSET IMAGE_BASE
+		//	MOV EAX, [EAX]
+		//	PUSH EAX
+		//	PUSH DS_FREE
+		//	CALL GetAddress
+		//	MOV EBX, EAX
+	//		POP EAX
+	//		ADD EAX, EBX
+			
+
 			PUSH DWORD PTR[EBP + 0x10]
-			CALL[EAX]
-			//CALL DWORD PTR DS:0x1166B2A8
+			MOV EAX, ds_free
+			MOV EAX, [EAX]
+			CALL EAX
 			MOV bAlreadyFreed, 1
 			CALL _wtpGl
 			JMP _out
 
 			JMP _original
 
 			_bspOk :
-		PUSH DWORD PTR[EBP + 0x10]
-			MOV EAX, ds_free
-			MOV EAX, [EAX]
-			CALL EAX
-			MOV bAlreadyFreed, 1
+			PUSH DWORD PTR[EBP + 0x10]
+				MOV EAX, ds_free
+				MOV EAX, [EAX]
+				CALL EAX
+				MOV bAlreadyFreed, 1
 
-			CALL _bspGl
-			JMP _out
+				CALL _bspGl
+				JMP _out
 
 			_fbgOk: //FIELD BACKGROUND
 			PUSH DWORD PTR[EBP + 0x10]

ff8_demaster/texturepatch_v2_fieldBackground.cpp

@@ -67,28 +67,29 @@ DWORD fieldReplacementFound;
 
 
 static char* lastFieldName;
-
+static int lastFieldnameSubstrPos = -1;
 /// <summary>
-///
+/// Returns final field path with either DDS or PNG extension with either palettted or non-paletted instance/version
 /// </summary>
 /// <returns>char* that points to texture of DDS or PNG</returns>
 char* GetFieldBackgroundReplacementTextureName()
 {
 	//directIO_fopenReroute: DEMASTER_EXP\textures\DEMASTER_EXP\textures\field_bg\bv\bvtr_1\bvtr_1_0_2.png, file not found
 	char n[256]{ 0 };
 	static char n2[256]{ 0 };
-	char localn[256]{ 0 };
+	static char localn[256]{ 0 }; //Maki: static so when assigned to lastFieldName it doesn't get fucked out
 	static char localn2[256]{ 0 };
 	int palette = tex_header[52];
 
-
+	
 
 	if (GetFieldBackgroundFilename(n))
 	{
 		n2[0] = '\0';
 		return n2;
 	}
 
+	
 
 	sprintf(localn2, "%s%u_%u", n, fieldBackgroundRequestedTPage - 16, palette);
 
@@ -101,11 +102,23 @@ char* GetFieldBackgroundReplacementTextureName()
 
 		OutputDebug("%s: %s, %s\n", __func__, localn, "palette not found");
 		lastFieldName = localn2;
-		return localn2;
+		//return localn2; //Maki: it's easier this way for me to replace whenn using no PNG
 	}
-		lastFieldName = localn2;
+	else
+	{
+		lastFieldName = localn; //Maki : localn2 was here instead of localn - probably debug
 		OutputDebug("%s: %s\n", __func__, localn);
-		return localn2;
+	}
+
+
+	if (lastFieldnameSubstrPos == -1)
+		lastFieldnameSubstrPos = strlen(DIRECT_IO_EXPORT_DIR) + strlen("textures\\");
+	//Maki: below are various after-fixes because we tried to do DDS but this one needs special treatment for GL segment- pretty easy
+	lastFieldName[strlen(lastFieldName) - 4] = '\0'; //Maki: This is to throw out the extension- yes, we need to do that so far
+	lastFieldName = lastFieldName + lastFieldnameSubstrPos;
+
+	
+		return lastFieldName; //Maki: yeah, it's for rework, but returning anyway for assembler inject sake
 }
 
 __declspec(naked) void _asm_InjectFieldBackgroundModule()
@@ -162,6 +175,10 @@ void _fbgGl()
 
 }
 
+
+
+//Maki: This gets checked at first- so we have actually ready .PNG path here- change it so we use one method, not three times getting path lol
+//			this checks if replacement exists for 0_0 for either DDS or PNG and sets fieldReplacementFound
 /// <summary>
 /// Passes the DWORD if either the replacement is found or not directly to the game engine
 /// </summary>

ff8_demaster/texturepatch_v2_fieldChara.cpp

@@ -97,7 +97,7 @@ __declspec(naked) void _fcpObtainData()
 		MOV ECX, EAX //EAX as always should return return-value
 		MOV EAX, OFFSET IMAGE_BASE
 		MOV EAX, [EAX]
-		ADD EAX, EAX //createGLTexture
+		ADD EAX, ECX //createGLTexture
 		POP ECX //restore ECX from stack
 		CALL EAX