From d3fc9238269ee94afec2a85f729b95d40abf8005 Mon Sep 17 00:00:00 2001 From: zsknight <> Date: Tue, 3 Jul 2001 22:28:54 +0000 Subject: [PATCH] Fix for FFMQ --- zsnes/src/cpu/65816d.inc | 8 ++++++++ zsnes/src/cpu/65816db.inc | 8 ++++++++ zsnes/src/cpu/65816dc.inc | 8 ++++++++ zsnes/src/cpu/e65816.inc | 1 - zsnes/src/cpu/e65816b.inc | 1 - zsnes/src/cpu/e65816c.inc | 1 - 6 files changed, 24 insertions(+), 3 deletions(-) diff --git a/zsnes/src/cpu/65816d.inc b/zsnes/src/cpu/65816d.inc index 544714ff..884b9579 100644 --- a/zsnes/src/cpu/65816d.inc +++ b/zsnes/src/cpu/65816d.inc @@ -1372,6 +1372,10 @@ COPemulmode jae .upperlower mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai + mov byte[intrset],2 +.notwai test dl,00010000b jnz .setx endloop @@ -1384,6 +1388,10 @@ COPemulmode je .dma mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai2 + mov byte[intrset],2 +.notwai2 test dl,00010000b jnz .setx endloop diff --git a/zsnes/src/cpu/65816db.inc b/zsnes/src/cpu/65816db.inc index 4a896fa0..cd0df811 100644 --- a/zsnes/src/cpu/65816db.inc +++ b/zsnes/src/cpu/65816db.inc @@ -1363,6 +1363,10 @@ COPemulmode mov esi,[snesmmap+ebx*4] mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai + mov byte[intrset],2 +.notwai test dl,00010000b jnz .setx endloop @@ -1372,6 +1376,10 @@ COPemulmode jae .upperlower mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai2 + mov byte[intrset],2 +.notwai2 test dl,00010000b jnz .setx endloop diff --git a/zsnes/src/cpu/65816dc.inc b/zsnes/src/cpu/65816dc.inc index 5cb04e0b..126c5bc9 100644 --- a/zsnes/src/cpu/65816dc.inc +++ b/zsnes/src/cpu/65816dc.inc @@ -1377,6 +1377,10 @@ COPemulmode mov esi,[snesmmap+ebx*4] mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai + mov byte[intrset],2 +.notwai test dl,00010000b jnz near .setx endloop @@ -1386,6 +1390,10 @@ COPemulmode jae near .upperlower mov [initaddrl],esi add esi,eax + cmp byte[esi],0CBh + jne .notwai2 + mov byte[intrset],2 +.notwai2 test dl,00010000b jnz near .setx endloop diff --git a/zsnes/src/cpu/e65816.inc b/zsnes/src/cpu/e65816.inc index d5e8ce7c..b0c84a33 100644 --- a/zsnes/src/cpu/e65816.inc +++ b/zsnes/src/cpu/e65816.inc @@ -1319,7 +1319,6 @@ COp7Em16:; ROR a,x endloop COp40: ; RTI s - mov byte[intrset],2 RTIMacro COp6B: ; RTL s RTLMacro diff --git a/zsnes/src/cpu/e65816b.inc b/zsnes/src/cpu/e65816b.inc index 08648ee6..6f95f2ca 100644 --- a/zsnes/src/cpu/e65816b.inc +++ b/zsnes/src/cpu/e65816b.inc @@ -1312,7 +1312,6 @@ COp7Em16:; ROR a,x endloop COp40: ; RTI s - mov byte[intrset],2 RTIMacro COp6B: ; RTL s RTLMacro diff --git a/zsnes/src/cpu/e65816c.inc b/zsnes/src/cpu/e65816c.inc index cabe6761..744f9ea2 100644 --- a/zsnes/src/cpu/e65816c.inc +++ b/zsnes/src/cpu/e65816c.inc @@ -1312,7 +1312,6 @@ COp7Em16:; ROR a,x endloop COp40: ; RTI s - mov byte[intrset],2 RTIMacro COp6B: ; RTL s RTLMacro