From a43a2856f1c2ebb9a2dfe2237f3381c5f389b706 Mon Sep 17 00:00:00 2001
From: Rampastring <rampastring@outlook.com>
Date: Thu, 10 Oct 2024 04:28:41 +0300
Subject: [PATCH] Enable multi-side support for loading side-specific MIX files
 for DTA

---
 src/dta_hacks.asm | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/dta_hacks.asm b/src/dta_hacks.asm
index 5a78707..c39efbd 100644
--- a/src/dta_hacks.asm
+++ b/src/dta_hacks.asm
@@ -101,6 +101,29 @@ sstring str_BriefingPCX, "BRIEFING.PCX"
 @SET 0x00601093, push str_SettingsINI
 @SET 0x00687E07, push str_SettingsINI
 
+; Set global variable byte containing side ID to load files for
+; (enabled until spawner has been reimplemented through Vinifera)
+@SET 0x004E2CFA, {mov byte [0x7E2500], al}
+@SET 0x004E2CFF, nop
+@SET 0x004E2D00, {add esp, 4}
+@SJMP 0x004E2D03, 0x004E2D13 ; jmp short
+@SET 0x004E2D05, nop
+
+; Load sidebar MIX files for new sides properly
+; (enabled until spawner has been reimplemented through Vinifera)
+@SET 0x005DD798, {mov cl, byte [0x007E2500]}
+@CLEAR 0x005DD79E, 0x90, 0x005DD7A2
+
+; Load speech MIX files for new sides properly
+; Defaults SpeechSide to our hijacked player side value
+; (enabled until spawner has been reimplemented through Vinifera)
+hack 0x005DD75B
+    mov  eax, [Scen]
+    xor  ecx, ecx
+    mov  cl, byte [0x007E2500] ; PlayerSide (was Session.IsGDI)
+    mov  [eax+0x1E44], ecx ; set SpeechSide
+    jmp  0x005DD784        ; go back to game code for initializing side
+
 ;
 ; The following patches will not be included in Vinifera compatible builds.
 ;
@@ -216,33 +239,13 @@ sstring str_TemperatPAL, "TEMPERAT.PAL"
 ; Remove framework mode mmt/mms loading
 @LJMP 0x004F5182, 0x004F528C    ; jmp loc_4F528C
 
-; Set global variable byte containing side ID to load files for
-@SET 0x004E2CFA, {mov byte [0x7E2500], al}
-@SET 0x004E2CFF, nop
-@SET 0x004E2D00, {add esp, 4}
-@SJMP 0x004E2D03, 0x004E2D13 ; jmp short
-@SET 0x004E2D05, nop
-
 ; Load sidebar MIX files for new sides properly (for saved games)
 @SET 0x005D6C4F, {mov cl, [eax+1D91h]}
 @CLEAR 0x005D6C55, 0x90, 0x005D6C58
 
-; Load sidebar MIX files for new sides properly
-@SET 0x005DD798, {mov cl, byte [0x007E2500]}
-@CLEAR 0x005DD79E, 0x90, 0x005DD7A2
-
 ; Load speech MIX files for new sides properly (for saved games)
 @SET 0x005D6DCE, {xor ecx, ecx}
 @SET 0x005D6DD0, {mov cl, [eax+1D91h]}
 @CLEAR 0x005D6DD6, 0x90, 0x005D6DDB
 
-; Load speech MIX files for new sides properly
-; Defaults SpeechSide to our hijacked player side value
-hack 0x005DD75B
-    mov  eax, [Scen]
-    xor  ecx, ecx
-    mov  cl, byte [0x007E2500] ; PlayerSide (was Session.IsGDI)
-    mov  [eax+0x1E44], ecx ; set SpeechSide
-    jmp  0x005DD784        ; go back to game code for initializing side
-
 %endif