Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4 digits in dex num in summary screen

Browse Source 
(cherry picked from commit 7175214663a817e72894bd4b594ba1f8cea701c3)
This commit is contained in:
Eduardo Quezada 2022-12-28 09:34:33 -03:00 committed by leo60228
parent 6cc2a1ef03
commit 5831f9344c
No known key found for this signature in database
GPG Key ID: 6F3EB461799AD95E
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

@ -547,7 +547,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.bg = 0, .bg = 0,
.tilemapLeft = 1, .tilemapLeft = 1,
.tilemapTop = 2, .tilemapTop = 2,
.width = 4, .width = 5,
.height = 2, .height = 2,
.paletteNum = 7, .paletteNum = 7,
.baseBlock = 387, .baseBlock = 387,
@ -559,7 +559,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.width = 9, .width = 9,
.height = 2, .height = 2,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 395, .baseBlock = 397,
}, },
[PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = { [PSS_LABEL_WINDOW_PORTRAIT_SPECIES] = {
.bg = 0, .bg = 0,
@ -568,7 +568,7 @@ static const struct WindowTemplate sSummaryTemplate[] =
.width = 9, .width = 9,
.height = 4, .height = 4,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 413, .baseBlock = 415,
}, },
[PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE [PSS_LABEL_WINDOW_END] = DUMMY_WIN_TEMPLATE
}; };
@ -581,7 +581,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 11, .width = 11,
.height = 2, .height = 2,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 449, .baseBlock = 451,
}, },
[PSS_DATA_WINDOW_INFO_ID] = { [PSS_DATA_WINDOW_INFO_ID] = {
.bg = 0, .bg = 0,
@ -590,7 +590,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 7, .width = 7,
.height = 2, .height = 2,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 471, .baseBlock = 473,
}, },
[PSS_DATA_WINDOW_INFO_ABILITY] = { [PSS_DATA_WINDOW_INFO_ABILITY] = {
.bg = 0, .bg = 0,
@ -599,7 +599,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 18, .width = 18,
.height = 4, .height = 4,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 485, .baseBlock = 487,
}, },
[PSS_DATA_WINDOW_INFO_MEMO] = { [PSS_DATA_WINDOW_INFO_MEMO] = {
.bg = 0, .bg = 0,
@ -608,7 +608,7 @@ static const struct WindowTemplate sPageInfoTemplate[] =
.width = 18, .width = 18,
.height = 6, .height = 6,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 557, .baseBlock = 559,
}, },
}; };
static const struct WindowTemplate sPageSkillsTemplate[] = static const struct WindowTemplate sPageSkillsTemplate[] =
@ -620,7 +620,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 10, .width = 10,
.height = 2, .height = 2,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 449, .baseBlock = 451,
}, },
[PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = { [PSS_DATA_WINDOW_SKILLS_RIBBON_COUNT] = {
.bg = 0, .bg = 0,
@ -629,7 +629,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 10, .width = 10,
.height = 2, .height = 2,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 469, .baseBlock = 471,
}, },
[PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = { [PSS_DATA_WINDOW_SKILLS_STATS_LEFT] = {
.bg = 0, .bg = 0,
@ -638,7 +638,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 6, .width = 6,
.height = 6, .height = 6,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 489, .baseBlock = 491,
}, },
[PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = { [PSS_DATA_WINDOW_SKILLS_STATS_RIGHT] = {
.bg = 0, .bg = 0,
@ -647,7 +647,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 3, .width = 3,
.height = 6, .height = 6,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 525, .baseBlock = 527,
}, },
[PSS_DATA_WINDOW_EXP] = { [PSS_DATA_WINDOW_EXP] = {
.bg = 0, .bg = 0,
@ -656,7 +656,7 @@ static const struct WindowTemplate sPageSkillsTemplate[] =
.width = 6, .width = 6,
.height = 4, .height = 4,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 543, .baseBlock = 545,
}, },
}; };
static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves static const struct WindowTemplate sPageMovesTemplate[] = // This is used for both battle and contest moves
@ -668,7 +668,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 9, .width = 9,
.height = 10, .height = 10,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 449, .baseBlock = 451,
}, },
[PSS_DATA_WINDOW_MOVE_PP] = { [PSS_DATA_WINDOW_MOVE_PP] = {
.bg = 0, .bg = 0,
@ -677,7 +677,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 6, .width = 6,
.height = 10, .height = 10,
.paletteNum = 8, .paletteNum = 8,
.baseBlock = 539, .baseBlock = 541,
}, },
[PSS_DATA_WINDOW_MOVE_DESCRIPTION] = { [PSS_DATA_WINDOW_MOVE_DESCRIPTION] = {
.bg = 0, .bg = 0,
@ -686,7 +686,7 @@ static const struct WindowTemplate sPageMovesTemplate[] = // This is used for bo
.width = 20, .width = 20,
.height = 4, .height = 4,
.paletteNum = 6, .paletteNum = 6,
.baseBlock = 599, .baseBlock = 601,
}, },
}; };
static const u8 sTextColors[][3] = static const u8 sTextColors[][3] =
@ -2836,7 +2836,11 @@ static void PrintNotEggInfo(void)
if (dexNum != 0xFFFF) if (dexNum != 0xFFFF)
{ {
StringCopy(gStringVar1, &gText_NumberClear01[0]); 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); ConvertIntToDecimalStringN(gStringVar2, dexNum, STR_CONV_MODE_LEADING_ZEROS, 3);
#endif
StringAppend(gStringVar1, gStringVar2); StringAppend(gStringVar1, gStringVar2);
if (!IsMonShiny(mon)) if (!IsMonShiny(mon))
{ {