diff --git a/desmume/src/addons/slot1_retail.cpp b/desmume/src/addons/slot1_retail.cpp index 8fb6cea36..a3ea9eff0 100644 --- a/desmume/src/addons/slot1_retail.cpp +++ b/desmume/src/addons/slot1_retail.cpp @@ -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; diff --git a/desmume/src/addons/slot1_retail_nand.cpp b/desmume/src/addons/slot1_retail_nand.cpp index ee6df7a86..197ae5ea1 100644 --- a/desmume/src/addons/slot1_retail_nand.cpp +++ b/desmume/src/addons/slot1_retail_nand.cpp @@ -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; diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index 25b65553e..fcdb88fe7 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -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 diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h index a3910692c..5cddffccc 100644 --- a/desmume/src/windows/resource.h +++ b/desmume/src/windows/resource.h @@ -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 diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 0bcb67236..09a64f082 100644 Binary files a/desmume/src/windows/resources.rc and b/desmume/src/windows/resources.rc differ diff --git a/desmume/src/windows/slot1_config.cpp b/desmume/src/windows/slot1_config.cpp index 1c22811fe..0c31b970b 100644 --- a/desmume/src/windows/slot1_config.cpp +++ b/desmume/src/windows/slot1_config.cpp @@ -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