From 4d9a8e254840106cb01fc8ca7c09d0df9d0115e6 Mon Sep 17 00:00:00 2001 From: suloku Date: Fri, 11 Nov 2016 19:13:39 +0100 Subject: [PATCH] - Hopefully fixed bug where some tickets were injected instead of the correct ones. - Added FRLG Mystic Ticket, thanks to Maveos! - Enabled Mystic Ticket for all FRLG, since everything points to the event being downloadable in those cartridges. - Removed the need for a txt file in the sd card root. --- arm9/source/display.cpp | 3 +- arm9/source/main.cpp | 52 ++++++++++++++--- arm9/source/me.h | 120 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 164 insertions(+), 11 deletions(-) diff --git a/arm9/source/display.cpp b/arm9/source/display.cpp index 7b9bae3..cdd2bc2 100644 --- a/arm9/source/display.cpp +++ b/arm9/source/display.cpp @@ -433,7 +433,7 @@ void displayPrintTickets( int cursor_position, int game, int language ) break; case 2: iprintf(" Aurora Ticket\n"); - //iprintf(" Mystic Ticket\n"); + iprintf(" Mystic Ticket\n"); break; } break; @@ -449,6 +449,7 @@ void displayPrintTickets( int cursor_position, int game, int language ) break; case 2: iprintf(" Aurora Ticket\n"); + iprintf(" Mystic Ticket (USA)\n"); break; } break; diff --git a/arm9/source/main.cpp b/arm9/source/main.cpp index 69a0073..27bceca 100644 --- a/arm9/source/main.cpp +++ b/arm9/source/main.cpp @@ -313,7 +313,7 @@ void mode_gba() maxoptions = 1; break; case 2: - maxoptions = 0; + maxoptions = 1; break; } break; @@ -327,7 +327,7 @@ void mode_gba() maxoptions = 1; break; case 2: - maxoptions = 0; + maxoptions = 1; break; } break; @@ -465,7 +465,15 @@ void mode_gba() } break; case 2: - GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_fre, game, language); + switch(cursor_position) + { + case 0: + GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_fre, game, language); + break; + case 1: + GBA_read_inject_restore(gbatype, mystic_ticket_FRLG_eng, game, language); + break; + } break; } break; @@ -487,7 +495,15 @@ void mode_gba() } break; case 2: - GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_ita, game, language); + switch(cursor_position) + { + case 0: + GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_ita, game, language); + break; + case 1: + GBA_read_inject_restore(gbatype, mystic_ticket_FRLG_eng, game, language); + break; + } break; } break; @@ -509,7 +525,15 @@ void mode_gba() } break; case 2: - GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_ger, game, language); + switch(cursor_position) + { + case 0: + GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_ger, game, language); + break; + case 1: + GBA_read_inject_restore(gbatype, mystic_ticket_FRLG_eng, game, language); + break; + } break; } break; @@ -531,7 +555,15 @@ void mode_gba() } break; case 2: - GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_esp, game, language); + switch(cursor_position) + { + case 0: + GBA_read_inject_restore(gbatype, aurora_ticket_FRLG_ninti_esp, game, language); + break; + case 1: + GBA_read_inject_restore(gbatype, mystic_ticket_FRLG_eng, game, language); + break; + } break; } break; @@ -758,6 +790,7 @@ int main(int argc, char* argv[]) // Init the screens displayInit(); +/* // Init DLDI (file system driver) sysSetBusOwners(true, true); int fat = fatInitDefault(); @@ -769,15 +802,16 @@ int main(int argc, char* argv[]) #ifdef DEBUG iprintf("Found DLDI: %s\n", io_dldi_data->friendlyName); #endif - +*/ // detect hardware mode = hwDetect(); - +/* // Load the ini file with the FTP settings and more options for (int i = 0; i < EXTRA_ARRAY_SIZE; i++) { extra_id[i] = 0xff000000; extra_size[i] = 0; } + #ifdef DEBUG iprintf("Loading INI file\n"); #endif @@ -795,7 +829,7 @@ int main(int argc, char* argv[]) #ifdef DEBUG iprintf("Done!\n"); #endif - +*/ if (slot2 > 0) mode = 4; diff --git a/arm9/source/me.h b/arm9/source/me.h index 7fbcb3e..fc71ff8 100644 --- a/arm9/source/me.h +++ b/arm9/source/me.h @@ -1066,7 +1066,125 @@ char aurora_ticket_FRLG_eng[1420] = { }; char mystic_ticket_FRLG_eng[1420] = { - + 0xF2, 0xD0, 0x00, 0x00, 0xE9, 0x03, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, + 0x1C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xB1, + 0xC7, 0xD3, 0xCD, 0xCE, 0xC3, 0xBD, 0x00, 0xCE, 0xC3, 0xBD, 0xC5, 0xBF, + 0xCE, 0xB2, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0xBF, 0xEC, 0xD7, 0xDC, 0xD5, 0xE2, 0xDB, 0xD9, + 0x00, 0xBD, 0xD5, 0xE6, 0xD8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC1, 0xE3, + 0x00, 0xE8, 0xE3, 0x00, 0xE8, 0xDC, 0xD9, 0x00, 0xE7, 0xD9, 0xD7, 0xE3, + 0xE2, 0xD8, 0x00, 0xDA, 0xE0, 0xE3, 0xE3, 0xE6, 0x00, 0xE3, 0xDA, 0x00, + 0xE8, 0xDC, 0xD9, 0x00, 0xCA, 0xC9, 0xC5, 0x1B, 0xC7, 0xC9, 0xC8, 0x00, + 0x00, 0x00, 0xBD, 0xBF, 0xC8, 0xCE, 0xBF, 0xCC, 0x00, 0xD5, 0xE2, 0xD8, + 0x00, 0xE1, 0xD9, 0xD9, 0xE8, 0x00, 0xE8, 0xDC, 0xD9, 0x00, 0xD8, 0xD9, + 0xE0, 0xDD, 0xEA, 0xD9, 0xE6, 0xED, 0x00, 0xE4, 0xD9, 0xE6, 0xE7, 0xE3, + 0xE2, 0x00, 0xDD, 0xE2, 0x00, 0x00, 0xDB, 0xE6, 0xD9, 0xD9, 0xE2, 0xAD, + 0x00, 0xCC, 0xD9, 0xD7, 0xD9, 0xDD, 0xEA, 0xD9, 0x00, 0xE8, 0xDC, 0xD9, + 0x00, 0xC7, 0xD3, 0xCD, 0xCE, 0xC3, 0xBD, 0x00, 0xCE, 0xC3, 0xBD, 0xC5, + 0xBF, 0xCE, 0x00, 0xD5, 0xE2, 0xD8, 0x00, 0x00, 0x00, 0x00, 0xE8, 0xDC, + 0xD9, 0xE2, 0x00, 0xE7, 0xD5, 0xEA, 0xD9, 0x00, 0xE8, 0xDC, 0xD9, 0x00, + 0xDB, 0xD5, 0xE1, 0xD9, 0xAB, 0xAB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0xBE, 0xE3, 0x00, 0xE2, 0xE3, 0xE8, 0x00, 0xE8, 0xE3, 0xE7, + 0xE7, 0x00, 0xE8, 0xDC, 0xDD, 0xE7, 0x00, 0xBF, 0xEC, 0xD7, 0xDC, 0xD5, + 0xE2, 0xDB, 0xD9, 0x00, 0xBD, 0xD5, 0xE6, 0xD8, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xD6, 0xD9, 0xDA, 0xE3, 0xE6, 0xD9, + 0x00, 0xE6, 0xD9, 0xD7, 0xD9, 0xDD, 0xEA, 0xDD, 0xE2, 0xDB, 0x00, 0xE8, + 0xDC, 0xD9, 0x00, 0xC7, 0xD3, 0xCD, 0xCE, 0xC3, 0xBD, 0x00, 0xCE, 0xC3, + 0xBD, 0xC5, 0xBF, 0xCE, 0xAB, 0xAB, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x5C, 0x32, 0x00, 0x00, + 0x33, 0xFF, 0xFF, 0xFF, 0xB8, 0x7C, 0x29, 0x01, 0x08, 0x6A, 0x5A, 0x2B, + 0xA8, 0x02, 0xBB, 0x01, 0xE9, 0x29, 0x01, 0x08, 0x2B, 0xF2, 0x02, 0xBB, + 0x01, 0xE9, 0x29, 0x01, 0x08, 0x2B, 0xF3, 0x02, 0xBB, 0x01, 0xE9, 0x29, + 0x01, 0x08, 0x47, 0x72, 0x01, 0x01, 0x00, 0x21, 0x0D, 0x80, 0x01, 0x00, + 0xBB, 0x01, 0xE9, 0x29, 0x01, 0x08, 0xBD, 0xF2, 0x29, 0x01, 0x08, 0x66, + 0x6D, 0x46, 0x72, 0x01, 0x01, 0x00, 0x21, 0x0D, 0x80, 0x00, 0x00, 0xBB, + 0x01, 0xE0, 0x29, 0x01, 0x08, 0x1A, 0x00, 0x80, 0x72, 0x01, 0x1A, 0x01, + 0x80, 0x01, 0x00, 0x09, 0x00, 0x29, 0x4A, 0x08, 0x29, 0xA8, 0x02, 0xBD, + 0x4F, 0x2A, 0x01, 0x08, 0x66, 0x6D, 0x6C, 0x02, 0xBD, 0xE1, 0x2A, 0x01, + 0x08, 0x66, 0x6D, 0x6C, 0x02, 0xBD, 0xB4, 0x2A, 0x01, 0x08, 0x66, 0x6D, + 0x6C, 0x02, 0xCE, 0xDC, 0xD5, 0xE2, 0xDF, 0x00, 0xED, 0xE3, 0xE9, 0x00, + 0xDA, 0xE3, 0xE6, 0x00, 0xE9, 0xE7, 0xDD, 0xE2, 0xDB, 0x00, 0xE8, 0xDC, + 0xD9, 0x00, 0xC7, 0xD3, 0xCD, 0xCE, 0xBF, 0xCC, 0xD3, 0xFE, 0xC1, 0xC3, + 0xC0, 0xCE, 0x00, 0xCD, 0xED, 0xE7, 0xE8, 0xD9, 0xE1, 0xAD, 0xFB, 0xD3, + 0xE3, 0xE9, 0x00, 0xE1, 0xE9, 0xE7, 0xE8, 0x00, 0xD6, 0xD9, 0x00, 0xFD, + 0x01, 0xAD, 0xFE, 0xCE, 0xDC, 0xD9, 0xE6, 0xD9, 0x00, 0xDD, 0xE7, 0x00, + 0xD5, 0x00, 0xE8, 0xDD, 0xD7, 0xDF, 0xD9, 0xE8, 0x00, 0xDC, 0xD9, 0xE6, + 0xD9, 0x00, 0xDA, 0xE3, 0xE6, 0x00, 0xED, 0xE3, 0xE9, 0xAD, 0xFF, 0xC3, + 0xE8, 0x00, 0xD5, 0xE4, 0xE4, 0xD9, 0xD5, 0xE6, 0xE7, 0x00, 0xE8, 0xE3, + 0x00, 0xD6, 0xD9, 0x00, 0xDA, 0xE3, 0xE6, 0x00, 0xE9, 0xE7, 0xD9, 0x00, + 0xD5, 0xE8, 0x00, 0xE8, 0xDC, 0xD9, 0xFE, 0xD0, 0xBF, 0xCC, 0xC7, 0xC3, + 0xC6, 0xC3, 0xC9, 0xC8, 0x00, 0xBD, 0xC3, 0xCE, 0xD3, 0x00, 0xE4, 0xE3, + 0xE6, 0xE8, 0xAD, 0xFB, 0xD1, 0xDC, 0xED, 0x00, 0xE2, 0xE3, 0xE8, 0x00, + 0xDB, 0xDD, 0xEA, 0xD9, 0x00, 0xDD, 0xE8, 0x00, 0xD5, 0x00, 0xE8, 0xE6, + 0xED, 0x00, 0xD5, 0xE2, 0xD8, 0x00, 0xE7, 0xD9, 0xD9, 0x00, 0xEB, 0xDC, + 0xD5, 0xE8, 0xFE, 0xDD, 0xE8, 0x00, 0xDD, 0xE7, 0x00, 0xD5, 0xD6, 0xE3, + 0xE9, 0xE8, 0xAC, 0xFF, 0xCE, 0xDC, 0xD5, 0xE2, 0xDF, 0x00, 0xED, 0xE3, + 0xE9, 0x00, 0xDA, 0xE3, 0xE6, 0x00, 0xE9, 0xE7, 0xDD, 0xE2, 0xDB, 0x00, + 0xE8, 0xDC, 0xD9, 0x00, 0xC7, 0xD3, 0xCD, 0xCE, 0xBF, 0xCC, 0xD3, 0xFE, + 0xC1, 0xC3, 0xC0, 0xCE, 0x00, 0xCD, 0xED, 0xE7, 0xE8, 0xD9, 0xE1, 0xAD, + 0xFF, 0xC9, 0xDC, 0xB8, 0x00, 0xC3, 0xB4, 0xE1, 0x00, 0xE7, 0xE3, 0xE6, + 0xE6, 0xED, 0xB8, 0x00, 0xFD, 0x01, 0xAD, 0x00, 0xD3, 0xE3, 0xE9, 0xE6, + 0x00, 0xBC, 0xBB, 0xC1, 0xB4, 0xE7, 0xFE, 0xC5, 0xBF, 0xD3, 0x00, 0xC3, + 0xCE, 0xBF, 0xC7, 0xCD, 0x00, 0xCA, 0xC9, 0xBD, 0xC5, 0xBF, 0xCE, 0x00, + 0xDD, 0xE7, 0x00, 0xDA, 0xE9, 0xE0, 0xE0, 0xAD, 0xFB, 0xCA, 0xE0, 0xD9, + 0xD5, 0xE7, 0xD9, 0x00, 0xE7, 0xE8, 0xE3, 0xE6, 0xD9, 0x00, 0xE7, 0xE3, + 0xE1, 0xD9, 0xE8, 0xDC, 0xDD, 0xE2, 0xDB, 0x00, 0xE3, 0xE2, 0x00, 0xED, + 0xE3, 0xE9, 0xE6, 0x00, 0xCA, 0xBD, 0xB8, 0xFE, 0xE8, 0xDC, 0xD9, 0xE2, + 0x00, 0xD7, 0xE3, 0xE1, 0xD9, 0x00, 0xD6, 0xD5, 0xD7, 0xDF, 0x00, 0xDA, + 0xE3, 0xE6, 0x00, 0xE8, 0xDC, 0xDD, 0xE7, 0xAD, 0xFF, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x02, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0xD5, 0x38, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x04, 0x09, 0x14, 0x00, + 0x41, 0x55, 0x52, 0x4F, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x01, 0x10, 0x10, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, + 0x00, 0x01, 0x11, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x01, 0x00, + 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x01, 0x00, 0x00, 0x01, + 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x10, + 0x10, 0x00, 0x10, 0x10, 0x10, 0x00, 0x00, 0x00, 0x10, 0x11, 0x11, 0x01, + 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x00, 0x11, 0x11, 0x01, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, + 0x11, 0x11, 0x11, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, 0x10, 0x11, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x01, 0x00, 0x00, + 0x10, 0x10, 0x00, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, + 0x00, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x01, 0x00, 0x10, 0x00, 0x00, + 0x10, 0x10, 0x10, 0x00, 0x10, 0x10, 0x00, 0x01, 0x01, 0x10, 0x00, 0x01, + 0x01, 0x10, 0x00, 0x01, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x11, 0x10, + 0x00, 0x01, 0x10, 0x00, 0x11, 0x11, 0x00, 0x01, 0x00, 0x01, 0x01, 0x01, + 0x10, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x11, 0x00, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x00, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x00, + 0x00, 0x00, 0x01, 0x00, 0x00, 0x11, 0x11, 0x01, 0x00, 0x00, 0x10, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x00, 0x00, 0x00, 0x10, 0x10, + 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, + 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x00, 0x10, + 0x10, 0x10, 0x11, 0x01, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, + 0x10, 0x00, 0x10, 0x00, 0x00, 0x01, 0x10, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x10, 0x10, 0x00, 0x00, 0x10, 0x10, 0x00, 0x11, 0x11, 0x00, + 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x00, 0x00, 0x00, 0x11, 0x11, 0x01, 0x00, 0x00, 0x10, 0x10, + 0x00, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x00, 0x00, 0x00, 0x01, 0x00, + 0x00, 0x00, 0x10, 0x00 }; //FRE