diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:44:43 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-12-31 00:44:43 -0500 |
| commit | 84fbcc9dd615e10f3f0c12c4bad8134872ea6c19 (patch) | |
| tree | 46ba6c4aa4b8bd5549516ec8ed37ebb455146ce1 /src | |
| parent | ec85c01e7c6d15060eddcc653db33a4b317646d2 (diff) | |
Fix modern -> UBFIX macro change
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_factory_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_factory_screen.c b/src/battle_factory_screen.c index 1ceff5b98..86e3b0233 100644 --- a/src/battle_factory_screen.c +++ b/src/battle_factory_screen.c @@ -1179,7 +1179,7 @@ static void CB2_InitSelectScreen(void) LoadPalette(gFrontierFactorySelectMenu_Pal, 0, 0x40); LoadPalette(sSelectText_Pal, 0xF0, 8); LoadPalette(sSelectText_Pal, 0xE0, 10); -#if UBFIX +#ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) @@ -1205,7 +1205,7 @@ static void CB2_InitSelectScreen(void) SetVBlankCallback(VBlankCB_SelectScreen); BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK); 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) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) @@ -1223,7 +1223,7 @@ static void CB2_InitSelectScreen(void) gMain.state++; break; case 5: -#if UBFIX +#ifdef UBFIX if (sFactorySelectScreen && sFactorySelectScreen->fromSummaryScreen) #else if (sFactorySelectScreen->fromSummaryScreen == TRUE) @@ -3330,7 +3330,7 @@ static void CB2_InitSwapScreen(void) gMain.state++; break; case 5: -#if UBFIX +#ifdef UBFIX if (sFactorySwapScreen && sFactorySwapScreen->fromSummaryScreen) #else if (sFactorySwapScreen->fromSummaryScreen == TRUE) |