From e2389545d28046aabe90c254b0476d1646f46244 Mon Sep 17 00:00:00 2001 From: AmbientMalice Date: Thu, 5 Mar 2015 21:13:15 +1000 Subject: [PATCH 1/5] Fix RE2 depth issues with Glide64 --- Config/Glide64.rdb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Config/Glide64.rdb b/Config/Glide64.rdb index 87f27b5c3..68b29a589 100644 --- a/Config/Glide64.rdb +++ b/Config/Glide64.rdb @@ -3045,6 +3045,7 @@ fb_smart=1 fix_tex_coord=128 n64_z_scale=1 swapmode=2 +fb_render=1 [2F493DD0-2E64DFD9-C:45] Good Name=Resident Evil 2 (U) (V1.0) @@ -3057,6 +3058,7 @@ fb_smart=1 fix_tex_coord=128 n64_z_scale=1 swapmode=2 +fb_render=1 [AA18B1A5-07DB6AEB-C:45] Good Name=Resident Evil 2 (U) (V1.1) @@ -3068,6 +3070,7 @@ fb_smart=1 fix_tex_coord=128 n64_z_scale=1 swapmode=2 +fb_render=1 [02D8366A-6CABEF9C-C:50] Good Name=Road Rash 64 (E) From 02e0ac33d44ea5b4e7548676cfd1e91072228390 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Mar 2015 11:31:42 -0500 Subject: [PATCH 2/5] CF=1 fixes Battlezone mountains/terrain missing polygons/flickering --- Config/Project64.rdb | 1 + 1 file changed, 1 insertion(+) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index 9b55b3230..a4b1032d2 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -848,6 +848,7 @@ Internal Name=BATTLEZONE Status=Broken (core) Core Note=broken graphics; use older PJ64 AiCountPerBytes=200 +Counter Factor=1 [9C7318D2-24AE0DC1-C:4A] Good Name=Beetle Adventure Racing (J) From c2964ac8053023c68cff2a82170394283889659b Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 5 Mar 2015 11:32:37 -0500 Subject: [PATCH 3/5] Battlezone seems to be compatible, not broken from core. --- Config/Project64.rdb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index a4b1032d2..99cfff6f9 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -845,8 +845,7 @@ Counter Factor=3 [55D4C4CE-7753C78A-C:45] Good Name=Battlezone - Rise of the Black Dogs (U) Internal Name=BATTLEZONE -Status=Broken (core) -Core Note=broken graphics; use older PJ64 +Status=Compatible AiCountPerBytes=200 Counter Factor=1 From 7131a4eb5c554dc0016ab8e91ffa43f765b7bff1 Mon Sep 17 00:00:00 2001 From: MELERIX Date: Thu, 5 Mar 2015 22:09:54 -0300 Subject: [PATCH 4/5] PJ64 NRage should be compiled before Project64Setup. --- Project64.vs2013.sln | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Project64.vs2013.sln b/Project64.vs2013.sln index efd9aed01..32b6005d2 100644 --- a/Project64.vs2013.sln +++ b/Project64.vs2013.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.21005.1 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3rd Party", "3rd Party", "{AA8F7F8E-5377-4911-859D-8A8817B0DB26}" EndProject @@ -12,6 +12,9 @@ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Source\Common\Common.vcxproj", "{B4A4B994-9111-42B1-93C2-6F1CA8BC4421}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Project64", "Source\Project64\Project64.vcxproj", "{7E534C8E-1ACE-4A88-8807-39A11ED4DA18}" + ProjectSection(ProjectDependencies) = postProject + {FD617E80-9E40-4138-85DA-B94633972E6A} = {FD617E80-9E40-4138-85DA-B94633972E6A} + EndProjectSection EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "RSP", "Source\RSP\RSP.vcxproj", "{A7ED562C-63F3-4B7E-B6B3-2CF7848752E1}" EndProject @@ -125,12 +128,12 @@ Global {3326E128-33AF-422C-BB7C-67CC6B915610} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} {4BC6906B-213E-40D7-9FC7-1A93E228393D} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} {731BD205-2826-4631-B7AF-117658E88DBC} = {AA8F7F8E-5377-4911-859D-8A8817B0DB26} + {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {93447136-FACD-4740-8F35-FC46FB4A9E82} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {427F1DCD-3BED-4010-9322-077A4C06D871} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {93CFEDF3-9A75-4484-B169-D9D8074F5AC2} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {05B9CB11-12D1-47CD-8E4A-88E12162119B} = {1379F817-7E3D-4F58-9C22-7E364E46E842} {25A25249-C284-4C5A-8DC2-26FC3EB13703} = {1379F817-7E3D-4F58-9C22-7E364E46E842} - {A4D13408-A794-4199-8FC7-4A9A32505005} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {462C2608-182F-452C-944F-AF201E19300B} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} {2DADDAA5-0F57-46ED-A974-747908DDC7F3} = {9FE699A5-41C3-4441-92AB-639B3D77DE26} EndGlobalSection From c871273ca265e38c9eea94af39aee007b582e902 Mon Sep 17 00:00:00 2001 From: AmbientMalice Date: Fri, 6 Mar 2015 14:50:29 +1000 Subject: [PATCH 5/5] Infernal Machine stability fixes. Changing to CF1 fixes the jeep handling and some nasty stuttering. Disabling Fast SP fixed some crashes with recompiler. Also seems to fix environment flicker? Plus some other tweaks. The game seems stable on a custom build (with the Factor 5 hack) with CPU recompiler and cxd4 RSP interpreter during testing except for the end of levels, when Indy's Trading Post causes the game to crash without Interpreter. The game appears to be far more stable in PJ64 than mupen64plus, however the game's audio timings are off, and the sound crackles. But I was able to drive Indy's jeep round in circles for 15 minutes without a single lockup. --- Config/Project64.rdb | 31 ++++++++++++++++++------------- 1 file changed, 18 insertions(+), 13 deletions(-) diff --git a/Config/Project64.rdb b/Config/Project64.rdb index 99cfff6f9..811ba6862 100644 --- a/Config/Project64.rdb +++ b/Config/Project64.rdb @@ -2967,13 +2967,12 @@ Status=Compatible Plugin Note=[video] errors:HUD; use Glide64 Counter Factor=1 - [3A6F8C6B-2897BAEB-C:50] Good Name=Indiana Jones and the Infernal Machine (E) (Unreleased) Internal Name=Indiana Jones -Status=Only intro/part OK -Core Note=unstable (see GameFAQ) -Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ) +Status=Issues (mixed) +Core Note=Recompiler Trading Post freeze. +Plugin Note=[rsp] interpreter only [sound] timing and crackle 32bit=No RDRAM Size=8 FuncFind=1 @@ -2982,32 +2981,38 @@ ViRefresh=1400 RSP-JumpTableSize=3584 SMM-Cache=1 SMM-FUNC=0 -SMM-PI DMA=0 -SMM-Protect=1 +SMM-PI DMA=1 +SMM-Protect=0 SMM-TLB=0 Sync Audio=0 Fixed Audio=1 -CPU Type=Interpreter +CPU Type=Recompiler +Linking=Off +Fast SP=No [AF9DCC15-1A723D88-C:45] Good Name=Indiana Jones and the Infernal Machine (U) Internal Name=Indiana Jones -Status=Only intro/part OK -Core Note=unstable (see GameFAQ) -Plugin Note=[rsp] interpreter only [video] errors:various (see GameFAQ) +Status=Issues (mixed) +Core Note=Recompiler Trading Post freeze. +Plugin Note=[rsp] interpreter only [sound] timing and crackle 32bit=No +Counter Factor=1 +RDRAM Size=8 FuncFind=1 HLE GFX=No ViRefresh=1400 RSP-JumpTableSize=3584 SMM-Cache=1 SMM-FUNC=0 -SMM-PI DMA=0 -SMM-Protect=1 +SMM-PI DMA=1 +SMM-Protect=0 SMM-TLB=0 Sync Audio=0 Fixed Audio=1 -CPU Type=Interpreter +CPU Type=Recompiler +Linking=Off +Fast SP=No [E436467A-82DE8F9B-C:45] Good Name=Indy Racing 2000 (U)