ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-04 18:30:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix modern -> UBFIX macro change

Browse Source
This commit is contained in:
GriffinR 2020-12-31 00:44:43 -05:00
parent ec85c01e7c
commit 84fbcc9dd6
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_factory_screen.c
View File

@ -1179,7 +1179,7 @@ static void CB2_InitSelectScreen(void)
LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40);
LoadPalette(sSelectText_Pal, 0xF0, 8); LoadPalette(sSelectText_Pal, 0xF0, 8);
LoadPalette(sSelectText_Pal, 0xE0, 10); LoadPalette(sSelectText_Pal, 0xE0, 10);
#if UBFIX #ifdef UBFIX
if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen)
#else #else
if (sFactorySelectScreen->fromSummaryScreen == TRUE) if (sFactorySelectScreen->fromSummaryScreen == TRUE)
@ -1205,7 +1205,7 @@ static void CB2_InitSelectScreen(void)
SetVBlankCallback(VBlankCB_SelectScreen); SetVBlankCallback(VBlankCB_SelectScreen);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_BG0_ON | DISPCNT_BG1_ON | DISPCNT_OBJ_1D_MAP);
#if UBFIX #ifdef UBFIX
if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen)
#else #else
if (sFactorySelectScreen->fromSummaryScreen == TRUE) if (sFactorySelectScreen->fromSummaryScreen == TRUE)
@ -1223,7 +1223,7 @@ static void CB2_InitSelectScreen(void)
gMain.state++; gMain.state++;
break; break;
case 5: case 5:
#if UBFIX #ifdef UBFIX
if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen)
#else #else
if (sFactorySelectScreen->fromSummaryScreen == TRUE) if (sFactorySelectScreen->fromSummaryScreen == TRUE)
@ -3330,7 +3330,7 @@ static void CB2_InitSwapScreen(void)
gMain.state++; gMain.state++;
break; break;
case 5: case 5:
#if UBFIX #ifdef UBFIX
if (sFactorySwapScreen && sFactorySwapScreen->fromSummaryScreen) if (sFactorySwapScreen && sFactorySwapScreen->fromSummaryScreen)
#else #else
if (sFactorySwapScreen->fromSummaryScreen == TRUE) if (sFactorySwapScreen->fromSummaryScreen == TRUE)