FF8: Fix crash on worldmap for spanish and italian versions (julianxh…

…okaxhiu#682)
tangtang95 · Mar 31, 2024 · ce4d848 · ce4d848
1 parent dabe98a
commit ce4d848
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -15,6 +15,7 @@
 
 ## FF8
 
+- Fix crash when some text windows are opening in worldmap on Spanish and Italian versions ( https://github.com/julianxhokaxhiu/FFNx/pull/682/files )
 - Graphics: Fix texture animations by copy only partially animated ( https://github.com/julianxhokaxhiu/FFNx/pull/670 )
 - Graphics: Allow more external texture replacement for battle effects ( https://github.com/julianxhokaxhiu/FFNx/pull/674 https://github.com/julianxhokaxhiu/FFNx/pull/676 )
 - SFX: Fix some external SFX effects that were not stopping when they were looped in certain scenes

diff --git a/src/common.h b/src/common.h
@@ -52,6 +52,8 @@
 #define NV_VERSION (!(version & 1))
 #define JP_VERSION (version == VERSION_FF8_12_JP || version == VERSION_FF8_12_JP_NV)
 #define FF8_US_VERSION (version == VERSION_FF8_12_US || version == VERSION_FF8_12_US_NV || version == VERSION_FF8_12_US_EIDOS || version == VERSION_FF8_12_US_EIDOS_NV)
+#define FF8_SP_VERSION (version == VERSION_FF8_12_SP || version == VERSION_FF8_12_SP_NV)
+#define FF8_IT_VERSION (version == VERSION_FF8_12_IT || version == VERSION_FF8_12_IT_NV)
 
 // FF8 does not support BLUE text!
 enum

diff --git a/src/voice.cpp b/src/voice.cpp
@@ -1372,16 +1372,16 @@ void voice_init()
 		replace_function(ff8_externals.battle_get_actor_name_sub_47EAF0, ff8_battle_get_actor_name);
 
 		// == World Map ==
-		replace_call_function(ff8_externals.sub_543CB0 + (FF8_US_VERSION ? 0x638 : 0x605), ff8_world_dialog_assign_text);
+		replace_call_function(ff8_externals.sub_543CB0 + (FF8_US_VERSION ? 0x638 : (FF8_SP_VERSION || FF8_IT_VERSION) ? 0x61C : 0x605), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_5484B0 + (FF8_US_VERSION ? 0x524 : 0x4FD), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54A230 + (FF8_US_VERSION ? 0xF : 0xD), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54D7E0 + (FF8_US_VERSION ? 0x72 : 0x6F), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x206 : 0x20C), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x396 : 0x3A9), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x3D2 : 0x3E5), ff8_world_dialog_assign_text);
-		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x67D : 0x68F), ff8_world_dialog_assign_text);
-		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x6A6 : 0x6BC), ff8_world_dialog_assign_text);
-		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0xEED : 0xF72), ff8_world_dialog_assign_text);
+		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x67D : (FF8_SP_VERSION ? 0x6CA : 0x68F)), ff8_world_dialog_assign_text);
+		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0x6A6 : (FF8_SP_VERSION ? 0x6F7 : 0x6BC)), ff8_world_dialog_assign_text);
+		replace_call_function(ff8_externals.sub_54E9B0 + (FF8_US_VERSION ? 0xEED : (FF8_SP_VERSION ? 0xFAD : 0xF72)), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54FDA0 + (FF8_US_VERSION ? 0xAE : 0xAC), ff8_world_dialog_assign_text);
 		replace_call_function(ff8_externals.sub_54FDA0 + (FF8_US_VERSION ? 0x178 : 0x175), ff8_world_dialog_assign_text);
 	}