* fix a few bugs related to 2D GPU registers (so there are atleast some of the graphics tests that pass)

* less shitty texture mapping (and perspective-correct interpolation in general). extra bonus is that it also takes less divisions.

1 files changed, 14 insertions, 0 deletions

diff --git a/NDS.cpp b/NDS.cpp
index 20f0f2f..4dff9e3 100644
--- a/NDS.cpp
+++ b/NDS.cpp
@@ -1296,6 +1296,8 @@ u16 ARM9IORead16(u32 addr)
     case 0x04000006: return GPU::VCount;
 
     case 0x04000060: return 0;
+    case 0x04000064:
+    case 0x04000066: return GPU::GPU2D_A->Read16(addr);
 
     case 0x040000B8: return DMAs[0]->Cnt & 0xFFFF;
     case 0x040000BA: return DMAs[0]->Cnt >> 16;
@@ -1343,6 +1345,12 @@ u16 ARM9IORead16(u32 addr)
     case 0x04000204: return ExMemCnt[0];
     case 0x04000208: return IME[0];
 
+    case 0x04000240: return GPU::VRAMCNT[0] | (GPU::VRAMCNT[1] << 8);
+    case 0x04000242: return GPU::VRAMCNT[2] | (GPU::VRAMCNT[3] << 8);
+    case 0x04000244: return GPU::VRAMCNT[4] | (GPU::VRAMCNT[5] << 8);
+    case 0x04000246: return GPU::VRAMCNT[6] | (WRAMCnt << 8);
+    case 0x04000248: return GPU::VRAMCNT[7] | (GPU::VRAMCNT[8] << 8);
+
     case 0x04000280: return DivCnt;
 
     case 0x040002B0: return SqrtCnt;
@@ -1374,6 +1382,8 @@ u32 ARM9IORead32(u32 addr)
     {
     case 0x04000004: return GPU::DispStat[0] | (GPU::VCount << 16);
 
+    case 0x04000064: return GPU::GPU2D_A->Read32(addr);
+
     case 0x040000B0: return DMAs[0]->SrcAddr;
     case 0x040000B4: return DMAs[0]->DstAddr;
     case 0x040000B8: return DMAs[0]->Cnt;
@@ -1404,6 +1414,10 @@ u32 ARM9IORead32(u32 addr)
     case 0x04000210: return IE[0];
     case 0x04000214: return IF[0];
 
+    case 0x04000240: return GPU::VRAMCNT[0] | (GPU::VRAMCNT[1] << 8) | (GPU::VRAMCNT[2] << 16) | (GPU::VRAMCNT[3] << 24);
+    case 0x04000244: return GPU::VRAMCNT[4] | (GPU::VRAMCNT[5] << 8) | (GPU::VRAMCNT[6] << 16) | (WRAMCnt << 24);
+    case 0x04000248: return GPU::VRAMCNT[7] | (GPU::VRAMCNT[8] << 8);
+
     case 0x04000290: return DivNumerator[0];
     case 0x04000294: return DivNumerator[1];
     case 0x04000298: return DivDenominator[0];