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

misc slot1 config related stuff

This commit is contained in:
zeromus 2013-04-16 17:03:16 +00:00
parent 548aee9e83
commit b31e692921
6 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
desmume/src/addons/slot1_retail.cpp
View File

@ -92,10 +92,13 @@ static u32 read32_GCDATAIN(u8 PROCNUM)
// Most games continuously compare the chip ID with
// the value in memory, probably to know if the card
// was removed.
// As DeSmuME boots directly from the game, the chip
// As DeSmuME normally boots directly from the game, the chip
// ID in main mem is zero and this value needs to be
// zero too.
//note that even if desmume was booting from firmware, and reading this chip ID to store in main memory,
//this still works, since it will have read 00 originally and then read 00 to validate.
//staff of kings verifies this (it also uses the arm7 IRQ 20)
if(nds.cardEjected) //TODO - handle this with ejected card slot1 device (and verify using this case)
return 0xFFFFFFFF;

3
desmume/src/addons/slot1_retail_nand.cpp
View File

@ -115,6 +115,9 @@ static u32 read32_GCDATAIN(u8 PROCNUM)
// ID in main mem is zero and this value needs to be
// zero too.
//note that even if desmume was booting from firmware, and reading this chip ID to store in main memory,
//this still works, since it will have read 00 originally and then read 00 to validate.
//staff of kings verifies this (it also uses the arm7 IRQ 20)
if(nds.cardEjected) //TODO - handle this with ejected card slot1 device (and verify using this case)
return 0xFFFFFFFF;

2
desmume/src/commandline.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2009-2012 DeSmuME team
Copyright (C) 2009-2013 DeSmuME team
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

1
desmume/src/windows/resource.h
View File

@ -390,6 +390,7 @@
#define IDC_ADDONS_INFO2 1035
#define IDC_PATHIMG 1036
#define IDC_PIANO_DS 1036
#define IDC_ADDONS_INFO3 1036
#define IDC_PATH 1037
#define IDC_PATHGAME 1037
#define IDC_PIANO_E 1037

BIN
desmume/src/windows/resources.rc
View File

Binary file not shown.

5
desmume/src/windows/slot1_config.cpp
View File

@ -1,5 +1,5 @@
/*
Copyright (C) 2011-2012 DeSmuME team
Copyright (C) 2011-2013 DeSmuME team
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
@ -126,6 +126,9 @@ BOOL CALLBACK Slot1Box_Proc(HWND dialog, UINT msg,WPARAM wparam,LPARAM lparam)
_OKbutton_slot1 = false;
wndConfigSlot1=CreateDialogW(hAppInst, MAKEINTRESOURCEW(Slot1_IDDs[temp_type_slot1]),
dialog, (DLGPROC)Slot1_Procs[temp_type_slot1]);
//SetWindowPos(GetDlgItem(dialog, IDC_ADDONS_INFO),HWND_TOP,0,0,0,0,SWP_NOMOVE|SWP_NOSIZE);
//EnableWindow(GetDlgItem(dialog, IDC_ADDONS_INFO),FALSE);
//EnableWindow(GetDlgItem(dialog, IDC_ADDONS_INFO),TRUE);
if ( (temp_type_slot1 == 0) || (_OKbutton_slot1) )
EnableWindow(OKbutton_slot1, TRUE);
else