diff --git a/desmume/AUTHORS b/desmume/AUTHORS index 51c444728..34a96f98c 100644 --- a/desmume/AUTHORS +++ b/desmume/AUTHORS @@ -6,15 +6,15 @@ Current team ------------ Guillaume Duhamel Normmatt -Bernat Muņoz (shash) Riccardo Magliocchetti -Max Tabachenko (CrazyMax) +CrazyMax zeromus rogerman Luigi__ Contributors ------------ +Bernat Muņoz (shash) Allustar amponzi Anthony Molinaro diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp index 7deac14cd..7ef8501b5 100644 --- a/desmume/src/NDSSystem.cpp +++ b/desmume/src/NDSSystem.cpp @@ -1999,7 +1999,9 @@ static void PrepareBiosARM9() //copy the logo content into the bios - Pokemon Platinum uses this in Pal Park trade //it compares the logo from the arm9 bios to the logo in the GBA header. - //NOTE: we could MAYBE solve this by patching the rom of a mounted GBA game with whatever's here, even if its all zeroes. + //NOTE: in the unlikely event that the valid header is missing from the gameInfo, we'd be doing wrong here. + // however, its nice not to have the logo embedded here. + // TODO - take a CRC of the logo, check vs logoCRC16, and a hardcoded value, to make sure all is in order--report error if not memcpy(&MMU.ARM9_BIOS[0x20], &gameInfo.header.logo[0], 0x9C); T1WriteWord(MMU.ARM9_BIOS, 0x20 + 0x9C, gameInfo.header.logoCRC16); //... and with that we are at 0xBC: diff --git a/desmume/src/bios.cpp b/desmume/src/bios.cpp index 71e322c34..3f2f37bbd 100644 --- a/desmume/src/bios.cpp +++ b/desmume/src/bios.cpp @@ -654,7 +654,7 @@ TEMPLATE static u32 RLUnCompWram() { //this routine is used by yoshi touch&go from the very beginning - printf("RLUnCompWram\n"); + //printf("RLUnCompWram\n"); int i; int len; diff --git a/desmume/src/windows/AboutBox.cpp b/desmume/src/windows/AboutBox.cpp index 01413f9f3..700c7a075 100644 --- a/desmume/src/windows/AboutBox.cpp +++ b/desmume/src/windows/AboutBox.cpp @@ -32,12 +32,13 @@ const char *team[] = { "Guillaume Duhamel", "Normmatt", "Riccardo Magliocchetti", - "Max Tabachenko (CrazyMax)", + "CrazyMax", "zeromus", "rogerman", "Luigi__", "", "Contributors\1", + "Bernat Muņoz (shash)", "Allustar", "amponzi", "Anthony Molinaro", @@ -52,7 +53,6 @@ const char *team[] = { "Pascal Giard (evilynux)", "Ben Jaques (masscat)", "Jeff Bland", - "Bernat Muņoz (shash)", "matusz", "nitsuja", "gocha",