atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

4 digits in dex num in summary screen

Browse source
This commit is contained in:
Eduardo Quezada 2022-12-28 09:34:33 -03:00
parent 9bad51cbc6
commit 7175214663
1 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/pokemon_summary_screen.c
View file

@ -546,7 +546,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.bg = 0,
.tilemapLeft = 1,
.tilemapTop = 2,
.width = 4,
.width = 5,
.height = 2,
.paletteNum = 7,
.baseBlock = 387,
@ -558,7 +558,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.width = 9,
.height = 2,
.paletteNum = 6,
.baseBlock = 395,
.baseBlock = 397,
},
[PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = {
.bg = 0,
@ -567,7 +567,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.width = 9,
.height = 4,
.paletteNum = 6,
.baseBlock = 413,
.baseBlock = 415,
},
[PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE
};
@ -580,7 +580,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 11,
.height = 2,
.paletteNum = 6,
.baseBlock = 449,
.baseBlock = 451,
},
[PSS_DATA_WINDOW_INFO_ID] = {
.bg = 0,
@ -589,7 +589,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 7,
.height = 2,
.paletteNum = 6,
.baseBlock = 471,
.baseBlock = 473,
},
[PSS_DATA_WINDOW_INFO_ABILITY] = {
.bg = 0,
@ -598,7 +598,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 18,
.height = 4,
.paletteNum = 6,
.baseBlock = 485,
.baseBlock = 487,
},
[PSS_DATA_WINDOW_INFO_MEMO] = {
.bg = 0,
@ -607,7 +607,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 18,
.height = 6,
.paletteNum = 6,
.baseBlock = 557,
.baseBlock = 559,
},
};
static const struct WindowTemplate sPageSkillsTemplate[] =
@ -619,7 +619,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 10,
.height = 2,
.paletteNum = 6,
.baseBlock = 449,
.baseBlock = 451,
},
[PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = {
.bg = 0,
@ -628,7 +628,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 10,
.height = 2,
.paletteNum = 6,
.baseBlock = 469,
.baseBlock = 471,
},
[PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = {
.bg = 0,
@ -637,7 +637,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 6,
.height = 6,
.paletteNum = 6,
.baseBlock = 489,
.baseBlock = 491,
},
[PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = {
.bg = 0,
@ -646,7 +646,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 3,
.height = 6,
.paletteNum = 6,
.baseBlock = 525,
.baseBlock = 527,
},
[PSS_DATA_WINDOW_EXP] = {
.bg = 0,
@ -655,7 +655,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 6,
.height = 4,
.paletteNum = 6,
.baseBlock = 543,
.baseBlock = 545,
},
};
static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves
@ -667,7 +667,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 9,
.height = 10,
.paletteNum = 6,
.baseBlock = 449,
.baseBlock = 451,
},
[PSS_DATA_WINDOW_MOVE_PP] = {
.bg = 0,
@ -676,7 +676,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 6,
.height = 10,
.paletteNum = 8,
.baseBlock = 539,
.baseBlock = 541,
},
[PSS_DATA_WINDOW_MOVE_DESCRIPTION] = {
.bg = 0,
@ -685,7 +685,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 20,
.height = 4,
.paletteNum = 6,
.baseBlock = 599,
.baseBlock = 601,
},
};
static const u8 sTextColors[][3] =
@ -2828,7 +2828,11 @@ static void PrintNotEggInfo(void)
if (dexNum != 0xFFFF)
{
StringCopy(gStringVar1, &gText_NumberClear01[0]);
#if P_DEX_FOUR_DIGITS_AMOUNT == TRUE
ConvertIntToDecimalStringN(gStringVar2, dexNum, STR_CONV_MODE_LEADING_ZEROS, 4);
#else
ConvertIntToDecimalStringN(gStringVar2, dexNum, STR_CONV_MODE_LEADING_ZEROS, 3);
#endif
StringAppend(gStringVar1, gStringVar2);
if (!IsMonShiny(mon))
{