Skip to content

Commit f690532

Browse files
author
Niko
committed
leave 'bug' enabled, oxide intro mouth is not correct, need to find cause before optimizing
1 parent edd2828 commit f690532

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed
Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
#include <common.h>
22

33
void DECOMP_CDSYS_SpuCallbackTransfer()
4-
{
5-
// Process the spu data "just" dumped,
6-
// Fix to the Naughty Dog Bug listed below
7-
DECOMP_CDSYS_SpuGetMaxSample();
8-
4+
{
95
// 0->1, and 1->0
106
sdata->irqAddr = sdata->irqAddr + 1;
117
sdata->irqAddr = sdata->irqAddr & 2;
128
SpuSetIRQAddr(sdata->irqAddr << 9);
139
SpuSetIRQ(1);
1410

15-
return;
16-
1711

1812

1913

@@ -26,7 +20,7 @@ void DECOMP_CDSYS_SpuCallbackTransfer()
2620
// Calling this "here" after flipping irqAddr,
2721
// means using "old" data, instead of the data
2822
// that was "just" dumped, was this a mistake?
29-
#if 0
23+
#if 1
3024
DECOMP_CDSYS_SpuGetMaxSample();
3125
#endif
3226
}

decompile/General/CDSYS/CDSYS_09_SpuEnableIRQ.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ void DECOMP_CDSYS_SpuEnableIRQ()
55
// === Naughty Dog Bug ===
66
// This is used to counter the bug
77
// in CDSYS_SpuCallbackTransfer
8-
#if 0
8+
#if 1
99
for(int i = 0; i < 0x200; i++)
1010
{
1111
sdata->SpuReadbackDst[i] = 0;
@@ -16,7 +16,7 @@ void DECOMP_CDSYS_SpuEnableIRQ()
1616
SpuSetTransferCallback(DECOMP_CDSYS_SpuCallbackTransfer);
1717
SpuSetIRQCallback(DECOMP_CDSYS_SpuCallbackIRQ);
1818

19-
sdata->irqAddr = 0;
19+
sdata->irqAddr = 1;
2020
SpuSetIRQAddr(sdata->irqAddr << 9);
2121
SpuSetIRQ(1);
2222
}

0 commit comments

Comments
 (0)