dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1600 from GriffinRichards/remove-berry-fix

Browse Source 
Remove berry fix
This commit is contained in:
GriffinR
2022-01-15 12:20:22 -05:00
committed by GitHub
parent 9ded1eb14e fd7457b05a
commit 755d9143a6
66 changed files with 22 additions and 9828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/ereader_screen.c
View File

@@ -41,8 +41,8 @@ static void Task_EReader(u8);
struct EReaderData gEReaderData;
extern const u8 gEReaderLinkData_Start[];
extern const u8 gEReaderLinkData_End[];
extern const u8 gMultiBootProgram_EReader_Start[];
extern const u8 gMultiBootProgram_EReader_End[];
static void EReader_Load(struct EReaderData *eReader, int size, u32 *data)
{
@@ -397,8 +397,8 @@ static void Task_EReader(u8 taskId)
break;
case ER_STATE_CONNECTING:
AddTextPrinterToWindow1(gJPText_Connecting);
// XXX: This (u32*) cast is discarding the const qualifier from gEReaderLinkData_Start
EReader_Load(&gEReaderData, gEReaderLinkData_End - gEReaderLinkData_Start, (u32*)gEReaderLinkData_Start);
// XXX: This (u32*) cast is discarding the const qualifier from gMultiBootProgram_EReader_Start
EReader_Load(&gEReaderData, gMultiBootProgram_EReader_End - gMultiBootProgram_EReader_Start, (u32*)gMultiBootProgram_EReader_Start);
data->state = ER_STATE_TRANSFER;
break;
case ER_STATE_TRANSFER: