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

Frontier pass clean-up

Browse Source
This commit is contained in:
DizzyEggg
2019-01-26 22:09:24 +01:00
parent 251d16b733
commit 54ddbaaf0c
1 changed files with 75 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontier_pass.c
+4 -6
View File
@@ -675,9 +675,7 @@ static void CB2_InitFrontierPass(void)
static void CB2_HideFrontierPass(void) static void CB2_HideFrontierPass(void)
{ {
if (HideFrontierPass()) if (HideFrontierPass())
{
LeaveFrontierPass(); LeaveFrontierPass();
}
} }
static bool32 InitFrontierPass(void) static bool32 InitFrontierPass(void)
@@ -753,7 +751,7 @@ static bool32 InitFrontierPass(void)
ShowBg(2); ShowBg(2);
LoadCursorAndSymbolSprites(); LoadCursorAndSymbolSprites();
SetVBlankCallback(VblankCb_FrontierPass); SetVBlankCallback(VblankCb_FrontierPass);
BlendPalettes(0xFFFFFFFF, 0x10, 0); BlendPalettes(0xFFFFFFFF, 0x10, RGB_BLACK);
BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0x10, 0, RGB_BLACK);
break; break;
case 10: case 10:
@@ -1095,15 +1093,15 @@ static void ShowAndPrintWindows(void)
FillWindowPixelBuffer(i, 0); FillWindowPixelBuffer(i, 0);
} }
x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 0x60); x = GetStringCenterAlignXOffset(1, gText_SymbolsEarned, 96);
AddTextPrinterParameterized3(WINDOW_EARNED_SYMBOLS, 1, x, 5, sTextColors[0], 0, gText_SymbolsEarned); AddTextPrinterParameterized3(WINDOW_EARNED_SYMBOLS, 1, x, 5, sTextColors[0], 0, gText_SymbolsEarned);
x = GetStringCenterAlignXOffset(1, gText_BattleRecord, 0x60); x = GetStringCenterAlignXOffset(1, gText_BattleRecord, 96);
AddTextPrinterParameterized3(WINDOW_BATTLE_RECORD, 1, x, 5, sTextColors[0], 0, gText_BattleRecord); AddTextPrinterParameterized3(WINDOW_BATTLE_RECORD, 1, x, 5, sTextColors[0], 0, gText_BattleRecord);
AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, 8, 5, 4, sTextColors[0], 0, gText_BattlePoints); AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, 8, 5, 4, sTextColors[0], 0, gText_BattlePoints);
ConvertIntToDecimalStringN(gStringVar4, sPassData->battlePoints, STR_CONV_MODE_LEFT_ALIGN, 5); ConvertIntToDecimalStringN(gStringVar4, sPassData->battlePoints, STR_CONV_MODE_LEFT_ALIGN, 5);
x = GetStringRightAlignXOffset(8, gStringVar4, 0x5B); x = GetStringRightAlignXOffset(8, gStringVar4, 91);
AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, 8, x, 16, sTextColors[0], 0, gStringVar4); AddTextPrinterParameterized3(WINDOW_BATTLE_POINTS, 8, x, 16, sTextColors[0], 0, gStringVar4);
sPassData->cursorArea = GetCursorAreaFromCoords(sPassData->cursorX - 5, sPassData->cursorY + 5); sPassData->cursorArea = GetCursorAreaFromCoords(sPassData->cursorX - 5, sPassData->cursorY + 5);