Skip to content

Commit

Permalink
NFS Carbon/ProStreet: Correct the serial the game uses to detect Most…
Browse files Browse the repository at this point in the history
… Wanted Black Edition saves (#499)

**Please merge together with
PCSX2/pcsx2#12340

Fixes an old bug where only base Most Wanted saves granted the cash
bonus, and MW Black Edition saves did not. This is because the game used
an incorrect serial to detect BE saves.


![image](https://github.com/user-attachments/assets/d1bbaaba-c283-4518-8af6-6e139dc24460)

ProStreet is seemingly unaffected, as it detects Most Wanted, Most
Wanted BE, Carbon, Carbon CE correctly.
  • Loading branch information
CookiePLMonster authored Feb 24, 2025
1 parent 9da5986 commit 7c2d5cb
Show file tree
Hide file tree
Showing 6 changed files with 116 additions and 0 deletions.
14 changes: 14 additions & 0 deletions patches/SLES-54321_ECCEEC09.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
gametitle=Need for Speed - Carbon (PAL-E) (SLES-54321)

[Fix Most Wanted Black Edition save detection]
author=Silent
description=Fixes the career cash bonus not checking for Most Wanted: Black Edition.

// Check for BESLES-53857 by reusing one of the unused UG2 serials (BASLUS-21065)
patch=0,EE,205B0498,extended,4C534542
patch=0,EE,205B049C,extended,352D5345
patch=0,EE,205B04A0,extended,37353833

patch=0,EE,2040134C,extended,0C10039F // j 00400E7C
patch=0,EE,20400E7C,extended,3C02005B // lui v0,0x005B
patch=0,EE,20400E84,extended,24420498 // addiu v0,v0,0x498
14 changes: 14 additions & 0 deletions patches/SLES-54492_C2909885.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
gametitle=Need for Speed - Carbon [Collector's Edition] (PAL-E) (SLES-54492)

[Fix Most Wanted Black Edition save detection]
author=Silent
description=Fixes the career cash bonus not checking for Most Wanted: Black Edition.

// Check for BESLES-53857 by reusing one of the unused UG2 serials (BASLUS-21065)
patch=0,EE,205B0488,extended,4C534542
patch=0,EE,205B048C,extended,352D5345
patch=0,EE,205B0490,extended,37353833

patch=0,EE,2040134C,extended,0C10039F // j 00400E7C
patch=0,EE,20400E7C,extended,3C02005B // lui v0,0x005B
patch=0,EE,20400E84,extended,24420488 // addiu v0,v0,0x488
24 changes: 24 additions & 0 deletions patches/SLES-55002_BEB531C8.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
gametitle=Need for Speed - ProStreet (PAL-E) (SLES-55002)

[Widescreen 16:9]
gsaspectratio=16:9
description=Widescreen Mode (16:9)
author=Xan1242 & Aero_, ported by Silent
// Enables Widescreen Mode
patch=0,EE,20168A10,extended,24020001 // li v0, 1
// Corrects Aspect Ratio
patch=0,EE,20682BF0,extended,3F400000 // Horizontal: 0.75f
patch=0,EE,20682BF4,extended,3FA0EA0F // Vertical: 1.2571429f

[Fix Most Wanted Black Edition save detection]
author=Silent
description=Fixes the career cash bonus not checking for Most Wanted: Black Edition.

// Check for BESLES-53857 by reusing one of the unused UG2 serials (BASLUS-21065)
patch=0,EE,2060E230,extended,4C534542
patch=0,EE,2060E234,extended,352D5345
patch=0,EE,2060E238,extended,37353833

patch=0,EE,2044D864,extended,0C1135A7 // jal 0x0044D69C
patch=0,EE,2044D69C,extended,3C020061 // lui v0,0x0061
patch=0,EE,2044D6A4,extended,2442E230 // addiu v0,v0,-0x1DD0
44 changes: 44 additions & 0 deletions patches/SLES-55006_F0A358FE.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
gametitle=Need for Speed - ProStreet (PAL-R) (SLES-55006)

[Widescreen 16:9]
gsaspectratio=16:9
description=Widescreen Mode (16:9)
author=Xan1242 & Aero_, ported by Silent
// Enables Widescreen Mode
patch=0,EE,20168A10,extended,24020001 // li v0, 1
// Corrects Aspect Ratio
patch=0,EE,20682BF0,extended,3F400000 // Horizontal: 0.75f
patch=0,EE,20682BF4,extended,3FA0EA0F // Vertical: 1.2571429f

[Fix Most Wanted and Carbon save detection]
author=Silent
description=Fixes the career cash bonus not checking for Most Wanted and Carbon saves. Now the game checks for PAL-E saves.

// Repurpose unused UG2 serials
// BISLPM-65766 -> BESLES-54492
patch=0,EE,2060E1E0,extended,4C534542
patch=0,EE,2060E1E4,extended,352D5345
patch=0,EE,2060E1E8,extended,32393434

// BKSLKA-25241 -> BESLES-54321
patch=0,EE,2060E1F0,extended,4C534542
patch=0,EE,2060E1F4,extended,352D5345
patch=0,EE,2060E1F8,extended,31323334

// BISLAJ-25054 -> BESLES-53857
patch=0,EE,2060E200,extended,4C534542
patch=0,EE,2060E204,extended,352D5345
patch=0,EE,2060E208,extended,37353833

// BASLUS-21267 -> BESLES-53557
patch=0,EE,2060E1C0,extended,4C534542
patch=0,EE,2060E1C4,extended,352D5345
patch=0,EE,2060E1C8,extended,37353533

// Repurpose unused parts of PS2MemcardManager::GetUG2TitleId to return our serials
patch=0,EE,2044D6E8,extended,03E00008 // jr ra
patch=0,EE,2044D700,extended,03E00008 // jr ra
patch=0,EE,2044D718,extended,03E00008 // jr ra
patch=0,EE,2044D804,extended,0C1135B9 // jal 0x0044D6E4
patch=0,EE,2044D834,extended,0C1135BF // jal 0x0044D6FC
patch=0,EE,2044D864,extended,0C1135C5 // jal 0x0044D714
10 changes: 10 additions & 0 deletions patches/SLUS-21493_7841A89E.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
gametitle=Need for Speed - Carbon (NTSC-U) (SLUS-21493)

[Fix Most Wanted Black Edition save detection]
author=Silent
description=Fixes the career cash bonus checking for an incorrect serial of Most Wanted: Black Edition.

// BASLAJ-25075 -> BASLUS-21351
patch=0,EE,205B0268,extended,4C534142
patch=0,EE,205B026C,extended,322D5355
patch=0,EE,205B0270,extended,31353331
10 changes: 10 additions & 0 deletions patches/SLUS-21494_52565480.pnach
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
gametitle=Need for Speed - Carbon [Collector's Edition] (NTSC-U) (SLUS-21494)

[Fix Most Wanted Black Edition save detection]
author=Silent
description=Fixes the career cash bonus checking for an incorrect serial of Most Wanted: Black Edition.

// BASLAJ-25075 -> BASLUS-21351
patch=0,EE,205B0288,extended,4C534142
patch=0,EE,205B028C,extended,322D5355
patch=0,EE,205B0290,extended,31353331

0 comments on commit 7c2d5cb

Please sign in to comment.