From 3c4f23cd39e2595636bb31297f71cffd310087c1 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Tue, 30 Dec 2008 05:01:30 +0000
Subject: [PATCH] - fix vs2005 project after asm file removal - fix error in
 new fadein/fadeout table usage (pixels werent masked by 0x7FFF causing table
 overruns)

---
 desmume/src/GPU.cpp                     | 14 ++--
 desmume/src/windows/DeSmuME_2005.vcproj | 88 -------------------------
 2 files changed, 7 insertions(+), 95 deletions(-)

diff --git a/desmume/src/GPU.cpp b/desmume/src/GPU.cpp
index a53424876..29a514d10 100644
--- a/desmume/src/GPU.cpp
+++ b/desmume/src/GPU.cpp
@@ -606,7 +606,7 @@ static BOOL setFinalColorSpecialIncrease (const GPU *gpu, u32 passing, u8 bgnum,
 			sourceB += ((31-sourceB) * modFraction) >> 4 ;
 			color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ;
 #endif
-			color = (fadeInColors[gpu->BLDY_EVY][color] | 0x8000);
+			color = (fadeInColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000);
 		}
 
 		T2WriteWord(dst, passing, color) ;
@@ -635,7 +635,7 @@ static BOOL setFinalColorSpecialDecrease (const GPU *gpu, u32 passing, u8 bgnum,
 			sourceB -= ((sourceB) * modFraction) >> 4 ;
 			color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ;
 #endif
-			color = (fadeOutColors[gpu->BLDY_EVY][color] | 0x8000);
+			color = (fadeOutColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000);
 		}
 		T2WriteWord(dst, passing, color) ;
 	}
@@ -732,7 +732,7 @@ static BOOL setFinalColorSpecialIncreaseWnd (const GPU *gpu, u32 passing, u8 bgn
 			sourceB += ((31-sourceB) * modFraction) >> 4 ;
 			color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ;
 #endif
-			color = (fadeInColors[gpu->BLDY_EVY][color] | 0x8000);
+			color = (fadeInColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000);
 		}
 
 		T2WriteWord(dst, passing, color) ;
@@ -766,7 +766,7 @@ static BOOL setFinalColorSpecialDecreaseWnd (const GPU *gpu, u32 passing, u8 bgn
 			sourceB -= ((sourceB) * modFraction) >> 4 ;
 			color = (sourceR & 0x1F) | ((sourceG & 0x1F) << 5) | ((sourceB & 0x1F) << 10) | 0x8000 ;
 #endif
-			color = (fadeOutColors[gpu->BLDY_EVY][color] | 0x8000);
+			color = (fadeOutColors[gpu->BLDY_EVY][color&0x7FFF] | 0x8000);
 		}
 		T2WriteWord(dst, passing, color) ;
 	}
@@ -2173,7 +2173,7 @@ static INLINE void GPU_ligne_layer(NDS_Screen * screen, u16 l)
 	u32 c;
 	BOOL BG_enabled  = TRUE;
 
-	c = T1ReadWord(ARM9Mem.ARM9_VMEM, gpu->core * 0x400);
+	c = T1ReadWord(ARM9Mem.ARM9_VMEM, gpu->core * 0x400) & 0x7FFF;
 
 	/* Apply fading to backdrop */
 	if((gpu->BLDCNT & 0x20) && (gpu->BLDY_EVY > 0))
@@ -2471,7 +2471,7 @@ static INLINE void GPU_ligne_MasterBrightness(NDS_Screen * screen, u16 l)
 #endif
 				*((u16 *) (dst + (i16 << 1))) = dstColor.val;
 #endif
-				((u16*)dst)[i16] = fadeInColors[gpu->MasterBrightFactor][((u16*)dst)[i16]];
+				((u16*)dst)[i16] = fadeInColors[gpu->MasterBrightFactor][((u16*)dst)[i16]&0x7FFF];
 			}
 			break;
 		}
@@ -2524,7 +2524,7 @@ static INLINE void GPU_ligne_MasterBrightness(NDS_Screen * screen, u16 l)
 #endif
 				*((u16 *) (dst + (i16 << 1))) = dstColor.val;
 #endif
-				((u16*)dst)[i16] = fadeOutColors[gpu->MasterBrightFactor][((u16*)dst)[i16]];
+				((u16*)dst)[i16] = fadeOutColors[gpu->MasterBrightFactor][((u16*)dst)[i16]&0x7FFF];
 			}
 			break;
 		}
diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 533563410..68de6ae94 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -569,94 +569,6 @@
 		<Filter
 			Name="asm"
 			>
-			<File
-				RelativePath="..\common-x64.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (SSE2)|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common-x86.asm"
-				>
-				<FileConfiguration
-					Name="Release (SSE2)|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common_sse2-x64.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release (SSE2)|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-			</File>
-			<File
-				RelativePath="..\common_sse2-x86.asm"
-				>
-				<FileConfiguration
-					Name="Debug|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Win32"
-					ExcludedFromBuild="true"
-					>
-					<Tool
-						Name="MASM"
-					/>
-				</FileConfiguration>
-			</File>
 			<File
 				RelativePath="..\matrix_sse2-x64.asm"
 				>