Added splash screen fallback to Mash's HRP (4.1.8 only)

Condensed some code in HRP\init.cpp.

Author: NovaRain

sfall/HRP/Init.cpp

@@ -305,25 +305,24 @@ void Setting::init(const char* exeFileName, std::string &cmdline) {
 	sf::SafeWrite32(0x482E30, FO_VAR_mapEntranceTileNum); // map_load_file_ (_tile_center_tile to _mapEntranceTileNum)
 
 	if (SCR_WIDTH != 640 || SCR_HEIGHT != 480) {
-		// Set the resolution for GNW95_init_mode_ex_
-		sf::SafeWrite32(0x4CAD6B, SCR_WIDTH);  // 640
-		sf::SafeWrite32(0x4CAD66, SCR_HEIGHT); // 480
+		// Set the resolution
+		sf::SafeWriteBatch<DWORD>(SCR_WIDTH, {
+			0x4CAD6B, // GNW95_init_mode_ex_
+			// for the overlapping temporary black window when loading/starting the game
+			0x480D84, // main_load_new_
+			0x480B04, // gnw_main_
+			0x47C6E5, 0x47C703 // LoadGame_
+		});
+		sf::SafeWriteBatch<DWORD>(SCR_HEIGHT, {
+			0x4CAD66, // GNW95_init_mode_ex_
+			// for the overlapping temporary black window when loading/starting the game
+			0x480D6C, // main_load_new_
+			0x480AFA, // gnw_main_
+			0x47C6E0, 0x47C70D // LoadGame_
+		});
 		// initWindow_ "Error initializing video mode ..."
 		sf::SafeWrite32(0x4B9245, (DWORD)&SCR_WIDTH);
 		sf::SafeWrite32(0x4B923F, (DWORD)&SCR_HEIGHT);
-
-		// Set the resolution for the overlapping temporary black window when loading/starting the game
-		// main_load_new_
-		sf::SafeWrite32(0x480D6C, SCR_HEIGHT);
-		sf::SafeWrite32(0x480D84, SCR_WIDTH);
-		// gnw_main_
-		sf::SafeWrite32(0x480AFA, SCR_HEIGHT);
-		sf::SafeWrite32(0x480B04, SCR_WIDTH);
-		// LoadGame_
-		sf::SafeWrite32(0x47C6E0, SCR_HEIGHT);
-		sf::SafeWrite32(0x47C6E5, SCR_WIDTH);
-		sf::SafeWrite32(0x47C703, SCR_WIDTH);
-		sf::SafeWrite32(0x47C70D, SCR_HEIGHT);
 	}
 	if (sf::isDebug) sf::SafeWrite8(0x480AF6, fo::WinFlags::Hidden); // gnw_main_
 

sfall/Modules/LoadOrder.cpp

@@ -585,6 +585,8 @@ __declspec(naked) void LoadOrder::art_get_name_hack() {
 	}
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
 static __declspec(naked) void game_splash_screen_hook() {
 	__asm {
 		call fo::funcoffs::db_fopen_;
@@ -610,6 +612,58 @@ static __declspec(naked) void game_splash_screen_hook() {
 	}
 }
 
+static DWORD hrpLoadRIX_func;
+static DWORD hrpLoadBMP_func;
+
+static __declspec(naked) void game_splash_screen_hook_rix_HRP() {
+	static DWORD retAddr;
+	__asm {
+		pop  retAddr;
+		call hrpLoadRIX_func;
+		test al, al
+		jnz  end;
+		add  esp, 24;
+		mov  eax, [esp + 0x114 - 0x108]; // splash value
+		push eax;
+		push 0x5023E8; // "art\splash\"
+		push 0x502404; // "%ssplash%d.rix"
+		lea  edx, [esp + 0x120 - 0x80]; // fullname
+		push edx;
+		call fo::funcoffs::sprintf_;
+		lea  eax, [esp + 0x124 - 0x80];
+		push eax;
+		push esi; // IMAGE8 data
+		call hrpLoadRIX_func;
+end:
+		jmp  retAddr;
+	}
+}
+
+static __declspec(naked) void game_splash_screen_hook_bmp_HRP() {
+	static const char* splashFmt = "%ssplash%d.bmp";
+	static DWORD retAddr;
+	__asm {
+		pop  retAddr;
+		call hrpLoadBMP_func;
+		test al, al
+		jnz  end;
+		add  esp, 24;
+		mov  eax, [esp + 0x114 - 0x108]; // splash value
+		push eax;
+		push 0x5023E8; // "art\splash\"
+		push splashFmt;
+		lea  edx, [esp + 0x120 - 0x80]; // fullname
+		push edx;
+		call fo::funcoffs::sprintf_;
+		lea  eax, [esp + 0x124 - 0x80];
+		push eax;
+		push esi; // IMAGE8 data
+		call hrpLoadBMP_func;
+end:
+		jmp  retAddr;
+	}
+}
+
 static fo::DbFile* __fastcall LoadFont(const char* font, const char* mode) {
 	char file[128];
 	const char* lang;
@@ -711,6 +765,12 @@ void LoadOrder::init() {
 
 	// Load splash screens from the default path if not found in the art\<language>\splash\ directory
 	HookCall(0x44444E, game_splash_screen_hook);
+	if (HRP::Setting::VersionIsValid) { // for HRP 4.1.8
+		hrpLoadRIX_func = HRP::Setting::GetAddress(0x1001A530);
+		hrpLoadBMP_func = HRP::Setting::GetAddress(0x1001A610);
+		HookCall(HRP::Setting::GetAddress(0x1001B0F6), game_splash_screen_hook_rix_HRP);
+		HookCall(HRP::Setting::GetAddress(0x1001B0C5), game_splash_screen_hook_bmp_HRP);
+	}
 
 	// Load fonts based on the game language
 	HookCalls(load_font_hook, {