ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-15 08:03:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed 'Summary_' prefix.

Browse Source
This commit is contained in:
Ariel Antonitis 2019-09-25 20:49:56 -04:00 committed by huderlem
parent ea638b82fa
commit 208e1c9689
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/pokemon_summary_screen.c
View File

@ -224,10 +224,10 @@ static void DrawExperienceProgressBar(struct Pokemon* mon);
static void DrawContestMoveHearts(u16 move); static void DrawContestMoveHearts(u16 move);
static void LimitEggSummaryPageDisplay(void); static void LimitEggSummaryPageDisplay(void);
static void ResetWindows(void); static void ResetWindows(void);
static void Summary_PrintMonInfo(void); static void PrintMonInfo(void);
static void Summary_PrintNotEggInfo(void); static void PrintNotEggInfo(void);
static void Summary_PrintEggInfo(void); static void PrintEggInfo(void);
static void Summary_PrintGenderSymbol(struct Pokemon *mon, u16 a); static void PrintGenderSymbol(struct Pokemon *mon, u16 a);
static void PrintPageNamesAndStatsPageToWindows(void); static void PrintPageNamesAndStatsPageToWindows(void);
static void CreatePageWindowTilemaps(u8 a); static void CreatePageWindowTilemaps(u8 a);
static void ClearPageWindowTilemaps(u8 a); static void ClearPageWindowTilemaps(u8 a);
@ -1173,7 +1173,7 @@ static bool8 SummaryScreen_LoadGraphics(void)
gMain.state++; gMain.state++;
break; break;
case 11: case 11:
Summary_PrintMonInfo(); PrintMonInfo();
gMain.state++; gMain.state++;
break; break;
case 12: case 12:
@ -1625,7 +1625,7 @@ static void sub_81C0704(u8 taskId)
SetTypeIcons(); SetTypeIcons();
break; break;
case 10: case 10:
Summary_PrintMonInfo(); PrintMonInfo();
break; break;
case 11: case 11:
PrintPageSpecificText(sMonSummaryScreen->currPageIndex); PrintPageSpecificText(sMonSummaryScreen->currPageIndex);
@ -2571,7 +2571,7 @@ static void DrawPokerusCuredSymbol(struct Pokemon *mon) // This checks if the mo
schedule_bg_copy_tilemap_to_vram(3); schedule_bg_copy_tilemap_to_vram(3);
} }
static void Summary_SetDexNumberColor(bool8 isMonShiny) static void SetDexNumberColor(bool8 isMonShiny)
{ {
if (!isMonShiny) if (!isMonShiny)
sub_8199C30(3, 1, 4, 8, 8, 0); sub_8199C30(3, 1, 4, 8, 8, 0);
@ -2695,19 +2695,19 @@ static void SummaryScreen_PrintTextOnWindow(u8 windowId, const u8 *string, u8 x,
AddTextPrinterParameterized4(windowId, 1, x, y, 0, lineSpacing, sTextColors_861CD2C[colorId], 0, string); AddTextPrinterParameterized4(windowId, 1, x, y, 0, lineSpacing, sTextColors_861CD2C[colorId], 0, string);
} }
static void Summary_PrintMonInfo(void) static void PrintMonInfo(void)
{ {
FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, PIXEL_FILL(0)); FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, PIXEL_FILL(0));
FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, PIXEL_FILL(0)); FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, PIXEL_FILL(0));
FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, PIXEL_FILL(0)); FillWindowPixelBuffer(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, PIXEL_FILL(0));
if (!sMonSummaryScreen->summary.isEgg) if (!sMonSummaryScreen->summary.isEgg)
Summary_PrintNotEggInfo(); PrintNotEggInfo();
else else
Summary_PrintEggInfo(); PrintEggInfo();
schedule_bg_copy_tilemap_to_vram(0); schedule_bg_copy_tilemap_to_vram(0);
} }
static void Summary_PrintNotEggInfo(void) static void PrintNotEggInfo(void)
{ {
u8 strArray[16]; u8 strArray[16];
struct Pokemon *mon = &sMonSummaryScreen->currentMon; struct Pokemon *mon = &sMonSummaryScreen->currentMon;
@ -2721,12 +2721,12 @@ static void Summary_PrintNotEggInfo(void)
if (!IsMonShiny(mon)) if (!IsMonShiny(mon))
{ {
SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 1);
Summary_SetDexNumberColor(FALSE); SetDexNumberColor(FALSE);
} }
else else
{ {
SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 7); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER, gStringVar1, 0, 1, 0, 7);
Summary_SetDexNumberColor(TRUE); SetDexNumberColor(TRUE);
} }
PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER);
} }
@ -2734,9 +2734,9 @@ static void Summary_PrintNotEggInfo(void)
{ {
ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER); ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_DEX_NUMBER);
if (!IsMonShiny(mon)) if (!IsMonShiny(mon))
Summary_SetDexNumberColor(FALSE); SetDexNumberColor(FALSE);
else else
Summary_SetDexNumberColor(TRUE); SetDexNumberColor(TRUE);
} }
StringCopy(gStringVar1, &gText_LevelSymbol[0]); StringCopy(gStringVar1, &gText_LevelSymbol[0]);
ConvertIntToDecimalStringN(gStringVar2, summary->level, 0, 3); ConvertIntToDecimalStringN(gStringVar2, summary->level, 0, 3);
@ -2747,12 +2747,12 @@ static void Summary_PrintNotEggInfo(void)
strArray[0] = CHAR_SLASH; strArray[0] = CHAR_SLASH;
StringCopy(&strArray[1], &gSpeciesNames[summary->species2][0]); StringCopy(&strArray[1], &gSpeciesNames[summary->species2][0]);
SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, &strArray[0], 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_SPECIES, &strArray[0], 0, 1, 0, 1);
Summary_PrintGenderSymbol(mon, summary->species2); PrintGenderSymbol(mon, summary->species2);
PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME);
PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); PutWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
} }
static void Summary_PrintEggInfo(void) static void PrintEggInfo(void)
{ {
GetMonNickname(&sMonSummaryScreen->currentMon, gStringVar1); GetMonNickname(&sMonSummaryScreen->currentMon, gStringVar1);
SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1); SummaryScreen_PrintTextOnWindow(PSS_LABEL_WINDOW_PORTRAIT_NICKNAME, gStringVar1, 0, 1, 0, 1);
@ -2761,7 +2761,7 @@ static void Summary_PrintEggInfo(void)
ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES); ClearWindowTilemap(PSS_LABEL_WINDOW_PORTRAIT_SPECIES);
} }
static void Summary_PrintGenderSymbol(struct Pokemon *mon, u16 species) static void PrintGenderSymbol(struct Pokemon *mon, u16 species)
{ {
if (species != SPECIES_NIDORAN_M && species != SPECIES_NIDORAN_F) if (species != SPECIES_NIDORAN_M && species != SPECIES_NIDORAN_F)
{ {