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
+75 -77
View File
@@ -34,12 +34,12 @@
// All windows displayed in the frontier pass. // All windows displayed in the frontier pass.
enum enum
{ {
WINDOW_EARNED_SYMBOLS, WINDOW_EARNED_SYMBOLS,
WINDOW_BATTLE_RECORD, WINDOW_BATTLE_RECORD,
WINDOW_BATTLE_POINTS, WINDOW_BATTLE_POINTS,
WINDOW_DESCRIPTION, WINDOW_DESCRIPTION,
WINDOW_4, WINDOW_4,
WINDOW_COUNT WINDOW_COUNT
}; };
// Windows displayed in the facilities map view. // Windows displayed in the facilities map view.
@@ -215,75 +215,75 @@ static const struct BgTemplate sMapBgTemplates[] =
static const struct WindowTemplate sPassWindowTemplates[] = static const struct WindowTemplate sPassWindowTemplates[] =
{ {
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 2, .tilemapLeft = 2,
.tilemapTop = 3, .tilemapTop = 3,
.width = 12, .width = 12,
.height = 3, .height = 3,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x1, .baseBlock = 0x1,
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 2, .tilemapLeft = 2,
.tilemapTop = 10, .tilemapTop = 10,
.width = 12, .width = 12,
.height = 3, .height = 3,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x26, .baseBlock = 0x26,
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 2, .tilemapLeft = 2,
.tilemapTop = 13, .tilemapTop = 13,
.width = 12, .width = 12,
.height = 4, .height = 4,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x4B, .baseBlock = 0x4B,
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 0, .tilemapLeft = 0,
.tilemapTop = 18, .tilemapTop = 18,
.width = 30, .width = 30,
.height = 3, .height = 3,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x7C, .baseBlock = 0x7C,
}, },
DUMMY_WIN_TEMPLATE DUMMY_WIN_TEMPLATE
}; };
static const struct WindowTemplate sMapWindowTemplates[] = static const struct WindowTemplate sMapWindowTemplates[] =
{ {
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 0, .tilemapLeft = 0,
.tilemapTop = 1, .tilemapTop = 1,
.width = 15, .width = 15,
.height = 5, .height = 5,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x1, .baseBlock = 0x1,
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 20, .tilemapLeft = 20,
.tilemapTop = 1, .tilemapTop = 1,
.width = 10, .width = 10,
.height = 14, .height = 14,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0x4D, .baseBlock = 0x4D,
}, },
{ {
.bg = 0, .bg = 0,
.tilemapLeft = 2, .tilemapLeft = 2,
.tilemapTop = 16, .tilemapTop = 16,
.width = 26, .width = 26,
.height = 4, .height = 4,
.paletteNum = 15, .paletteNum = 15,
.baseBlock = 0xDA, .baseBlock = 0xDA,
}, },
DUMMY_WIN_TEMPLATE DUMMY_WIN_TEMPLATE
}; };
static const u8 sTextColors[][3] = static const u8 sTextColors[][3] =
@@ -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);