ShuriZma
/
melonDS
mirror of https://github.com/melonDS-emu/melonDS.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* bump version number 

* BLDALPHA is readable
This commit is contained in:
StapleButter 2017-07-16 03:47:44 +02:00
parent 08bdef481f
commit cfb9e20fe1
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
melon.rc
View File

@ -6,8 +6,8 @@
//include version information in .exe, modify these values to match your needs
1 VERSIONINFO
FILEVERSION 0,4,4,4
PRODUCTVERSION 0,4,4,4
FILEVERSION 0,5,5,5
PRODUCTVERSION 0,5,5,5
FILETYPE VFT_APP
{
BLOCK "StringFileInfo"
@ -15,14 +15,14 @@ FILETYPE VFT_APP
BLOCK "040904E4"
{
VALUE "CompanyName", "Melon Factory of Kuribo64"
VALUE "FileVersion", "0.4"
VALUE "FileVersion", "0.5"
VALUE "FileDescription", "DS emulator, sorta. also 1st quality melon."
VALUE "InternalName", "SDnolem"
VALUE "LegalCopyright", "2016-2017 StapleButter & co."
VALUE "LegalTrademarks", ""
VALUE "OriginalFilename", "zafkflzdasd.exe"
VALUE "ProductName", "melonDS"
VALUE "ProductVersion", "0.4"
VALUE "ProductVersion", "0.5"
}
}
BLOCK "VarFileInfo"

9
src/GPU2D.cpp
View File

@ -161,6 +161,8 @@ u16 GPU2D::Read16(u32 addr)
case 0x04A: return WinCnt[2] | (WinCnt[3] << 8);
case 0x050: return BlendCnt;
case 0x052: return BlendAlpha;
// BLDY is write-only
case 0x064: return CaptureCnt & 0xFFFF;
case 0x066: return CaptureCnt >> 16;
@ -203,13 +205,15 @@ void GPU2D::Write8(u32 addr, u8 val)
case 0x04A: WinCnt[2] = val; return;
case 0x04B: WinCnt[3] = val; return;
case 0x050: BlendCnt = (BlendCnt & 0xFF00) | val; return;
case 0x050: BlendCnt = (BlendCnt & 0x3F00) | val; return;
case 0x051: BlendCnt = (BlendCnt & 0x00FF) | (val << 8); return;
case 0x052:
BlendAlpha = (BlendAlpha & 0x1F00) | (val & 0x1F);
EVA = val & 0x1F;
if (EVA > 16) EVA = 16;
return;
case 0x53:
BlendAlpha = (BlendAlpha & 0x001F) | ((val & 0x1F) << 8);
EVB = val & 0x1F;
if (EVB > 16) EVB = 16;
return;
@ -320,8 +324,9 @@ void GPU2D::Write16(u32 addr, u16 val)
WinCnt[3] = val >> 8;
return;
case 0x050: BlendCnt = val; return;
case 0x050: BlendCnt = val & 0x3FFF; return;
case 0x052:
BlendAlpha = val & 0x1F1F;
EVA = val & 0x1F;
if (EVA > 16) EVA = 16;
EVB = (val >> 8) & 0x1F;

1
src/GPU2D.h
View File

@ -92,6 +92,7 @@ private:
bool Win1Active;
u16 BlendCnt;
u16 BlendAlpha;
u8 EVA, EVB;
u8 EVY;

2
src/version.h
View File

@ -19,7 +19,7 @@
#ifndef VERSION_H
#define VERSION_H
#define MELONDS_VERSION "0.4"
#define MELONDS_VERSION "0.5"
#define MELONDS_URL "http://melonds.kuribo64.net/"