FF7: Fix direct color (#587)

julianxhokaxhiu · Sep 2, 2023 · 8080625 · 8080625
1 parent 0c22bb9
commit 8080625
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -5,6 +5,7 @@
 ## FF7
 
 - Ambient: Allow ambient effects to playback in fields that use movies as background
+- Renderer: Fix black color in some field maps (spipe2 for example)
 
 # 1.16.0
 

diff --git a/src/common.cpp b/src/common.cpp
@@ -1650,7 +1650,7 @@ void convert_image_data(const unsigned char *image_data, uint32_t *converted_ima
 				o += tex_format->bytesperpixel;
 
 				// PSX style mask bit
-				if(color_key && (pixel & ~tex_format->alpha_mask) == 0)
+				if((color_key == 1 && (pixel & ~tex_format->alpha_mask) == 0) || (color_key == 3 && pixel == 0))
 				{
 					converted_image_data[c++] = 0;
 					continue;

diff --git a/src/ff7/field/field.cpp b/src/ff7/field/field.cpp
@@ -52,7 +52,10 @@ namespace ff7::field
         ff7_externals.field_layers[dst]->tex_header = tex_header;
 
         if(ff7_externals.field_layers[src]->type == 1) ff7_externals.make_field_tex_header_pal(tex_header);
-        if(ff7_externals.field_layers[src]->type == 2) ff7_externals.make_field_tex_header(tex_header);
+        if(ff7_externals.field_layers[src]->type == 2) {
+            ff7_externals.make_field_tex_header(tex_header);
+            tex_header->color_key = 3;
+        }
 
         struc_3->tex_header = tex_header;
 
@@ -267,4 +270,4 @@ namespace ff7::field
         patch_code_dword((uint32_t)&common_externals.execute_opcode_table[WAIT], (DWORD)&opcode_script_WAIT);
         replace_function(ff7_externals.sub_611BAE, opcode_IFSW_compare_sub);
     }
-}
+}
diff --git a/src/ff7_opengl.cpp b/src/ff7_opengl.cpp
@@ -291,6 +291,11 @@ void ff7_init_hooks(struct game_obj *_game_object)
 		patch_code_int(ff7_externals.field_init_viewport_values + 0x6E, 240);
 	}
 
+	// ########################
+	// field direct color black
+	// ########################
+	patch_code_short(uint32_t(ff7_externals.field_convert_type2_layers) + 0xE3, 0x8000);
+
 	// #####################
 	// worldmap footsteps
 	// #####################