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

fix some slot-2 addons and bump trunk version number

This commit is contained in:
zeromus 2011-02-01 21:44:35 +00:00
parent 0d4763d281
commit ca6c16394e
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/addons/guitarGrip.cpp
View File

@ -37,8 +37,8 @@ static u8 guitarGrip_read08(u32 procnum, u32 adr)
{ {
//INFO("GuitarGrip: read 08 at 0x%08X\n", adr); //INFO("GuitarGrip: read 08 at 0x%08X\n", adr);
if (adr == 0x0A000000) return (~guitarKeyStatus); if (adr == 0x0A000000) return (~guitarKeyStatus);
else if(adr&1) return 0xFF; else if(adr&1) return 0xF9;
else return 0xF9; else return 0xFF;
} }
static u16 guitarGrip_read16(u32 procnum, u32 adr) static u16 guitarGrip_read16(u32 procnum, u32 adr)
{ {

16
desmume/src/addons/piano.cpp
View File

@ -44,7 +44,7 @@ static void piano_write32(u32 procnum, u32 adr, u32 val)
//INFO("piano: write 32 at 0x%08X = %08X\n", adr, val); //INFO("piano: write 32 at 0x%08X = %08X\n", adr, val);
} }
extern int currFrameCounter; extern int currFrameCounter;
static u8 piano_read08(u32 procnum, u32 adr) static u8 piano_read08(u32 procnum, u32 adr)
{ {
//printf("piano: read 08 at 0x%08X\n", adr); //printf("piano: read 08 at 0x%08X\n", adr);
@ -72,18 +72,22 @@ static u8 piano_read08(u32 procnum, u32 adr)
//LOG("PIANO: %04X\n",pianoKeyStatus); //LOG("PIANO: %04X\n",pianoKeyStatus);
if(adr == 0x09FFFFFE) return ~(pianoKeyStatus&0xFF); if(adr == 0x09FFFFFE) return (~(pianoKeyStatus&0xFF));
if(adr == 0x09FFFFFF) return ~((pianoKeyStatus>>8)&0xFF); if(adr == 0x09FFFFFF) return (~((pianoKeyStatus>>8)&0xFF))&~(0x18);
if(adr&1) return 0x07; if(adr&1) return 0x07;
else return 0x00; else return 0x00;
} }
static u16 piano_read16(u32 procnum, u32 adr) static u16 piano_read16(u32 procnum, u32 adr)
{ {
//printf("piano: read 16 at 0x%08X\n", adr); //printf("piano: read 16 at 0x%08X\n", adr);
return 0x07FF; if(adr != 0x09FFFFFE)
return 0x07FF;
u16 ret = piano_read08(procnum,0x09FFFFFE)|(piano_read08(procnum,0x09FFFFFF)<<8);
//return ( (PIANO_PAK & 0x1800 ) == 0 );
return ret;
} }
static u32 piano_read32(u32 procnum, u32 adr) static u32 piano_read32(u32 procnum, u32 adr)
{ {
//printf("piano: read 32 at 0x%08X\n", adr); //printf("piano: read 32 at 0x%08X\n", adr);
return 0x07FF07FF; return 0x07FF07FF;

4
desmume/src/version.cpp
View File

@ -83,8 +83,8 @@
#define DESMUME_COMPILER_DETAIL "" #define DESMUME_COMPILER_DETAIL ""
#endif #endif
#define DESMUME_VERSION_NUMERIC 90600 #define DESMUME_VERSION_NUMERIC 90700
#define DESMUME_VERSION_STRING " " "0.9.6" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER #define DESMUME_VERSION_STRING " " "0.9.7" DESMUME_SUBVERSION_STRING DESMUME_FEATURE_STRING DESMUME_PLATFORM_STRING DESMUME_CPUEXT_STRING DESMUME_COMPILER
#define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING #define DESMUME_NAME_AND_VERSION DESMUME_NAME DESMUME_VERSION_STRING
u32 EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; } u32 EMU_DESMUME_VERSION_NUMERIC() { return DESMUME_VERSION_NUMERIC; }