Use ff7_japanese_edition as flag

julianxhokaxhiu · Sep 28, 2024 · b46ce00 · b46ce00
1 parent 4a04623
commit b46ce00
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/misc/FFNx.toml b/misc/FFNx.toml
@@ -688,9 +688,13 @@ ff7_external_opening_music = false
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~
 ff7_field_center = true
 
-# This flag enables Japanese text rendering mode
+# Native Japanese edition
 #~~~~~~~~~~~~~~~~~~~~~~~~~~~
-ff7_japanese_text = false
+# This flag will force the game to use the native Japanese font rendering.
+# Native eStore release will auto-enable this flag.
+# NOTE: This WILL NOT work on non-Japanese releases. You need the official Japanese release to make use of it.
+#~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ff7_japanese_edition = false
 
 ## MODDER OPTIONS - These options are mostly useful to modders and should not be enabled during normal play.
 

diff --git a/src/cfg.cpp b/src/cfg.cpp
@@ -126,7 +126,6 @@ std::vector<std::string> disable_animated_textures_on_field;
 long ff7_fps_limiter;
 bool ff7_footsteps;
 bool ff7_field_center;
-bool ff7_japanese_text;
 bool enable_analogue_controls;
 bool enable_inverted_vertical_camera_controls;
 bool enable_inverted_horizontal_camera_controls;
@@ -288,7 +287,7 @@ void read_cfg()
 	ff7_fps_limiter = config["ff7_fps_limiter"].value_or(FPS_LIMITER_DEFAULT);
 	ff7_footsteps = config["ff7_footsteps"].value_or(false);
 	ff7_field_center = config["ff7_field_center"].value_or(true);
-	ff7_japanese_text = config["ff7_japanese_text"].value_or(false);
+	ff7_japanese_edition = config["ff7_japanese_edition"].value_or(false);
 	enable_analogue_controls = config["enable_analogue_controls"].value_or(false);
 	enable_inverted_vertical_camera_controls = config["enable_inverted_vertical_camera_controls"].value_or(false);
 	enable_inverted_horizontal_camera_controls = config["enable_inverted_horizontal_camera_controls"].value_or(false);

diff --git a/src/cfg.h b/src/cfg.h
@@ -137,7 +137,6 @@ extern std::vector<std::string> disable_animated_textures_on_field;
 extern long ff7_fps_limiter;
 extern bool ff7_footsteps;
 extern bool ff7_field_center;
-extern bool ff7_japanese_text;
 extern bool enable_analogue_controls;
 extern bool enable_inverted_vertical_camera_controls;
 extern bool enable_inverted_horizontal_camera_controls;

diff --git a/src/ff7_opengl.cpp b/src/ff7_opengl.cpp
@@ -365,7 +365,7 @@ void ff7_init_hooks(struct game_obj *_game_object)
 	// ###########################
 	// japanese text
 	// ###########################
-	if (ff7_japanese_text)
+	if (ff7_japanese_edition)
 	{
 		replace_function(ff7_externals.field_submit_draw_text_640x480_6E706D, field_submit_draw_text_640x480_6E706D_jp);
 		replace_function((uint32_t)ff7_externals.engine_load_menu_graphics_objects_6C1468, engine_load_menu_graphics_objects_6C1468_jp);