From eda19cfc5ee92eed04c1cc5ec4e7475d5a0407a4 Mon Sep 17 00:00:00 2001 From: LegendOfDragoon Date: Tue, 14 Apr 2015 22:07:45 -0700 Subject: [PATCH 1/2] Fix regression in GetInstructionInfo I previously made a commit to fix a reordering issue, but did not realize it needed that COPO_MF_Instruction flag for branching. This should fix the Ogre Battle issue. --- Source/RSP/Recompiler Analysis.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/RSP/Recompiler Analysis.c b/Source/RSP/Recompiler Analysis.c index a36bb64eb..63141c71c 100644 --- a/Source/RSP/Recompiler Analysis.c +++ b/Source/RSP/Recompiler Analysis.c @@ -1410,7 +1410,7 @@ void GetInstructionInfo(DWORD PC, OPCODE * RspOp, OPCODE_INFO * info) { info->SourceReg0 = UNUSED_OPERAND; info->SourceReg1 = UNUSED_OPERAND; if (RspOp->rd == 0x4 || RspOp->rd == 0x7){ - info->flags = InvalidOpcode; + info->flags = InvalidOpcode | COPO_MF_Instruction; } else{ info->flags = COPO_MF_Instruction | GPR_Instruction | Load_Operation; } From f68edb9dd2028fa07003c08958bf9c61a33b7c6e Mon Sep 17 00:00:00 2001 From: LegendOfDragoon Date: Tue, 14 Apr 2015 22:11:04 -0700 Subject: [PATCH 2/2] Disable 32bit for Ogre Battle 64 This should fix certain issues with the game. --- Config/Project64.rdb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index fdc0922b4..ca0b22e91 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -4065,6 +4065,7 @@ Internal Name=OgreBattle64 Status=Issues (plugin) Core Note=old [!] ROM is bad; high system requirement Plugin Note=[video] missing:backgrounds in battle scenes +32bit=No [E6419BC5-69011DE3-C:45] Good Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.0) @@ -4072,6 +4073,7 @@ Internal Name=OgreBattle64 Status=Issues (plugin) Core Note=high system requirement Plugin Note=[video] missing:backgrounds in battle scenes +32bit=No [0ADAECA7-B17F9795-C:45] Good Name=Ogre Battle 64 - Person of Lordly Caliber (U) (V1.1) @@ -4079,6 +4081,7 @@ Internal Name=OgreBattle64 Status=Issues (plugin) Core Note=high system requirement Plugin Note=[video] missing:backgrounds in battle scenes +32bit=No [AE2D3A35-24F0D41A-C:50] Good Name=Olympic Hockey Nagano '98 (E) (M4)