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

Replaced two types with our ones we've defined.

This commit is contained in:
evilynux 2007-01-14 22:28:39 +00:00
parent aeacc62ef7
commit 7323665278
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
desmume/src/ctrlssdl.c
View File

@ -119,9 +119,9 @@ void update_keypad(u16 keys)
u16 get_keypad() u16 get_keypad()
{ {
u16 keypad; u16 keypad;
keypad = ~((unsigned short *)MMU.ARM7_REG)[0x130>>1]; keypad = ~((u16 *)MMU.ARM7_REG)[0x130>>1];
keypad = (keypad & 0x3) << 10; keypad = (keypad & 0x3) << 10;
keypad |= ~((unsigned short *)ARM9Mem.ARM9_REG)[0x130>>1] & 0x3FF; keypad |= ~((u16 *)ARM9Mem.ARM9_REG)[0x130>>1] & 0x3FF;
return keypad; return keypad;
} }