diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-11-04 17:46:07 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-11-04 17:46:07 -0500 |
| commit | 1220f0655c3aa028002bb54952ffc76d73b4dc7c (patch) | |
| tree | 484f47335386e80fde3ad40c4ae2f6a14442d53b | |
| parent | c3080a5a2a4985f75155fba0bb307cdf7e90bfb5 (diff) | |
Revert to original battle factory gcc 10 fix
| -rw-r--r-- | src/battle_factory_screen.c | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 1242d6359..c10bbc5e4 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1145,7 +1145,11 @@ static void CB2_InitSelectScreen(void) LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); LoadPalette(gUnknown_0861046C, 0xF0, 8); LoadPalette(gUnknown_0861046C, 0xE0, 10); + #if MODERN + if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) + #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) + #endif gPlttBufferUnfaded[228] = sFactorySelectScreen->unk2A4; LoadPalette(gUnknown_0861039C, 0x20, 4); gMain.state++; @@ -1167,7 +1171,11 @@ static void CB2_InitSelectScreen(void) SetVBlankCallback(Select_VblankCb); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP); + #if MODERN + if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) + #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) + #endif { Select_SetWinRegs(88, 152, 32, 96); ShowBg(3); @@ -1181,7 +1189,11 @@ static void CB2_InitSelectScreen(void) gMain.state++; break; case 5: + #if MODERN + if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) + #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) + #endif sFactorySelectScreen->cursorPos = gLastViewedMonIndex; Select_InitMonsData(); Select_InitAllSprites(); @@ -1229,9 +1241,7 @@ static void CB2_InitSelectScreen(void) } } -// This should be called at the top of CB2_InitSelectScreen -// sFactorySelectScreen is dereferenced prior to being allocated otherwise -static NOINLINE void Select_InitMonsData(void) +static void Select_InitMonsData(void) { u8 i; @@ -3084,9 +3094,7 @@ static void sub_819D9EC(u8 taskId) } } -// This should be called at the top of CB2_InitSwapScreen -// sFactorySwapScreen is dereferenced prior to being allocated otherwise -static NOINLINE void Swap_InitStruct(void) +static void Swap_InitStruct(void) { if (sFactorySwapScreen == NULL) { @@ -3174,7 +3182,11 @@ static void CB2_InitSwapScreen(void) gMain.state++; break; case 5: + #if MODERN + if (sFactorySwapScreen && sFactorySwapScreen->fromSummaryScreen) + #else if (sFactorySwapScreen->fromSummaryScreen == TRUE) + #endif sFactorySwapScreen->cursorPos = gLastViewedMonIndex; gMain.state++; break; |