From 20aa3cc42e8318e6ff03412f412c522442d9703e Mon Sep 17 00:00:00 2001 From: zeromus Date: Wed, 9 Feb 2011 00:36:25 +0000 Subject: [PATCH] now that i have a piano to test with, refine piano emulation a bit. also rename that file to conform to more recent standards --- desmume/src/Makefile.am | 2 +- .../src/addons/{piano.cpp => slot2_piano.cpp} | 33 +++++++++---------- desmume/src/windows/DeSmuME_2005.vcproj | 2 +- desmume/src/windows/DeSmuME_2008.vcproj | 2 +- .../src/windows/DeSmuME_2010.vcxproj.filters | 2 +- desmume/src/wx/wxDeSmuME_2008.vcproj | 2 +- 6 files changed, 20 insertions(+), 23 deletions(-) rename desmume/src/addons/{piano.cpp => slot2_piano.cpp} (72%) diff --git a/desmume/src/Makefile.am b/desmume/src/Makefile.am index 9d30db6a3..842803793 100644 --- a/desmume/src/Makefile.am +++ b/desmume/src/Makefile.am @@ -80,7 +80,7 @@ libdesmume_a_SOURCES = \ utils/libfat/partition.cpp \ utils/libfat/partition.h \ addons.cpp addons.h \ - addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp addons/expMemory.cpp addons/piano.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail.cpp \ + addons/slot2_mpcf.cpp addons/slot2_paddle.cpp addons/gbagame.cpp addons/none.cpp addons/rumblepak.cpp addons/guitarGrip.cpp addons/expMemory.cpp addons/slot2_piano.cpp addons/slot1_none.cpp addons/slot1_r4.cpp addons/slot1_retail.cpp \ cheatSystem.cpp cheatSystem.h \ texcache.cpp texcache.h rasterize.cpp rasterize.h \ metaspu/metaspu.cpp metaspu/metaspu.h \ diff --git a/desmume/src/addons/piano.cpp b/desmume/src/addons/slot2_piano.cpp similarity index 72% rename from desmume/src/addons/piano.cpp rename to desmume/src/addons/slot2_piano.cpp index 67d066758..97ea79303 100644 --- a/desmume/src/addons/piano.cpp +++ b/desmume/src/addons/slot2_piano.cpp @@ -1,20 +1,17 @@ -/* Copyright (C) 2010 DeSmuME team +/* Copyright (C) 2010-2011 DeSmuME team - This file is part of DeSmuME + This file is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 2 of the License, or + (at your option) any later version. - DeSmuME is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + This file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - DeSmuME is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with DeSmuME; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + You should have received a copy of the GNU General Public License + along with the this software. If not, see . */ #include "../addons.h" @@ -75,14 +72,14 @@ static u8 piano_read08(u32 procnum, u32 adr) if(adr == 0x09FFFFFE) return (~(pianoKeyStatus&0xFF)); if(adr == 0x09FFFFFF) return (~((pianoKeyStatus>>8)&0xFF))&~(0x18); - if(adr&1) return 0x07; - else return 0x00; + if(adr&1) return 0xE7; + else return 0xFF; } static u16 piano_read16(u32 procnum, u32 adr) { //printf("piano: read 16 at 0x%08X\n", adr); if(adr != 0x09FFFFFE) - return 0x07FF; + return 0xE7FF; u16 ret = piano_read08(procnum,0x09FFFFFE)|(piano_read08(procnum,0x09FFFFFF)<<8); //return ( (PIANO_PAK & 0x1800 ) == 0 ); return ret; @@ -90,7 +87,7 @@ static u16 piano_read16(u32 procnum, u32 adr) static u32 piano_read32(u32 procnum, u32 adr) { //printf("piano: read 32 at 0x%08X\n", adr); - return 0x07FF07FF; + return 0xE7FFE7FF; } static void piano_info(char *info) { strcpy(info, "Piano for EasyPiano"); } diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj index 4f6bfcc4e..85fd0dbc0 100644 --- a/desmume/src/windows/DeSmuME_2005.vcproj +++ b/desmume/src/windows/DeSmuME_2005.vcproj @@ -1648,7 +1648,7 @@ > Windows\tools - + Core\addons diff --git a/desmume/src/wx/wxDeSmuME_2008.vcproj b/desmume/src/wx/wxDeSmuME_2008.vcproj index 0b150b8ac..93ee83624 100644 --- a/desmume/src/wx/wxDeSmuME_2008.vcproj +++ b/desmume/src/wx/wxDeSmuME_2008.vcproj @@ -1005,7 +1005,7 @@ >