From 0473cf14e280f59f5cbaa231ec3162df0e916b93 Mon Sep 17 00:00:00 2001
From: zsknight <>
Date: Tue, 29 May 2001 21:44:12 +0000
Subject: [PATCH] FFMQ hidden lines fixed

---
 zsnes/src/cpu/execute.asm | 10 ++++++++--
 zsnes/src/init.asm        |  9 +++++++++
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/zsnes/src/cpu/execute.asm b/zsnes/src/cpu/execute.asm
index 724222eb..68532590 100644
--- a/zsnes/src/cpu/execute.asm
+++ b/zsnes/src/cpu/execute.asm
@@ -111,7 +111,7 @@ EXTSYM sfx128lineloc,sfx160lineloc,sfx192lineloc,sfxobjlineloc,sfxclineloc
 EXTSYM PLOTJmpa,PLOTJmpb,FxTable,FxTableb,FxTablec,FxTabled
 EXTSYM SfxPBR,SCBRrel,SfxSCBR,SfxCOLR,hdmaearlstart,SFXCounter
 EXTSYM fxbit01,fxbit01pcal,fxbit23,fxbit23pcal,fxbit45,fxbit45pcal,fxbit67,fxbit67pcal
-EXTSYM SfxSFR,nosprincr
+EXTSYM SfxSFR,nosprincr,hirqmode2
 EXTSYM cpucycle,debstop,switchtovirqdeb,debstop3,switchtonmideb
 EXTSYM ReadSPC7110log,WriteSPC7110log
 
@@ -942,6 +942,7 @@ NetSaveState:
 %%novirq
     test byte[INTEnab],10h
     jz %%noirq
+%%setagain
     cmp byte[intrset],2
     jbe %%nointrseta3
     dec byte[intrset]
@@ -950,8 +951,13 @@ NetSaveState:
 %%nointrseta3
     cmp byte[intrset],1
     jne %%nointrseta2
+    cmp byte[hirqmode2],1
+    je %%hirqchange
     mov byte[intrset],8
     jmp %%noirq
+%%hirqchange
+    mov byte[intrset],3
+    jmp %%setagain
 %%nointrseta2
     test dl,04h
     jnz %%noirq
@@ -1303,7 +1309,7 @@ NEWSYM endprog
 
     EXTSYM SDD1Array,SDD1Entry,SDD1Sort
     call SDD1Sort
-    jmp .nodecomppack
+;    jmp .nodecomppack
     cmp byte[SDD1Enable],0
     jne .yesdecomppack
     cmp dword[SDD1Entry],0
diff --git a/zsnes/src/init.asm b/zsnes/src/init.asm
index 24181be5..dcf1e84e 100644
--- a/zsnes/src/init.asm
+++ b/zsnes/src/init.asm
@@ -1325,6 +1325,7 @@ NEWSYM Reg4212hack,    dd 0
 NEWSYM CacheCheckSkip,     db 0
 NEWSYM HIRQSkip,     db 0
 NEWSYM ClearScreenSkip, db 0
+NEWSYM hirqmode2, db 0
 SECTION .text
 
 ; hacks :
@@ -1426,6 +1427,14 @@ NEWSYM headerhack
     mov byte[HIRQSkip],0
     mov dword[WindowDisables],0
     mov byte[ClearScreenSkip],0
+    mov byte[hirqmode2],0
+
+    mov esi,[romdata]
+    add esi,7FC0h
+    cmp dword[esi],'FF M'
+    jne .notffmq
+    mov byte[hirqmode2],1
+.notffmq
 
     mov esi,[romdata]
     add esi,7FC0h