From a1a130a44d1bbc0d5679ddad59f87ab4eb5da4a1 Mon Sep 17 00:00:00 2001
From: NovaRain <novarain@gmail.com>
Date: Sun, 6 Apr 2025 12:33:38 +0800
Subject: [PATCH] Minor code edits to Movies.cpp

---
 sfall/Modules/Movies.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/sfall/Modules/Movies.cpp b/sfall/Modules/Movies.cpp
index 1fce45aa..72a35f4e 100644
--- a/sfall/Modules/Movies.cpp
+++ b/sfall/Modules/Movies.cpp
@@ -485,13 +485,13 @@ char MoviePaths[MaxMovies * 65];
 static DWORD Artimer1DaysCheckTimer;
 
 static __declspec(naked) void Artimer1DaysCheckHack() {
-	static const DWORD Artimer1DaysCheckJmp = 0x4A3790;
 	static const DWORD Artimer1DaysCheckJmpLess = 0x4A37A9;
 	__asm {
 		cmp edx, Artimer1DaysCheckTimer;
 		jl  less;
-		jmp Artimer1DaysCheckJmp;
+		retn;
 less:
+		add esp, 4;
 		jmp Artimer1DaysCheckJmpLess;
 	}
 }
@@ -528,9 +528,9 @@ static __declspec(naked) void LostFocus() {
 	long isActive; // _GNW95_isActive
 	__asm { // prolog
 		pushad;
-		mov  ebp, esp;
-		sub  esp, __LOCAL_SIZE;
-		mov  isActive, eax;
+		mov ebp, esp;
+		sub esp, __LOCAL_SIZE;
+		mov isActive, eax;
 	}
 
 	Sound::SoundLostFocus(isActive);
@@ -601,7 +601,7 @@ void Movies::init() {
 		char s[255];
 		sprintf_s(s, "Applying patch: MovieTimer_artimer1 = %d.", Artimer1DaysCheckTimer);
 		dlogr(s, DL_INIT);
-		MakeJump(0x4A378B, Artimer1DaysCheckHack);
+		MakeCall(0x4A378B, Artimer1DaysCheckHack);
 	}
 
 	SkipOpeningMoviesPatch();