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

4 digits option for dex numbers

Browse source
This commit is contained in:
Eduardo Quezada 2022-12-23 11:32:01 -03:00
parent c356041273
commit 9bad51cbc6
2 changed files with 20 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
include/config/pokemon.h
View file

@ -12,6 +12,7 @@
#define P_DEX_EMPTY_ENTRY_SKIP TRUE // If TRUE, the Pokédex numerical order will skip empty entries if they don't have a seen or caught entry before or after. #define P_DEX_EMPTY_ENTRY_SKIP TRUE // If TRUE, the Pokédex numerical order will skip empty entries if they don't have a seen or caught entry before or after.
#define P_DEX_EMPTY_ENTRY_AT_ENDS FALSE // If TRUE and P_DEX_EMPTY_ENTRY_SKIP is on, it will show trailing missing entries at the beginning and end of the scrolling list. #define P_DEX_EMPTY_ENTRY_AT_ENDS FALSE // If TRUE and P_DEX_EMPTY_ENTRY_SKIP is on, it will show trailing missing entries at the beginning and end of the scrolling list.
#define P_DEX_SEPARATE_FORMS_CAUGHT FALSE // If TRUE, in order to see form dex data, they need to be caught separately. #define P_DEX_SEPARATE_FORMS_CAUGHT FALSE // If TRUE, in order to see form dex data, they need to be caught separately.
#define P_DEX_FOUR_DIGITS_AMOUNT TRUE // If TRUE,
// Other settings // Other settings
#define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball. #define P_SHEDINJA_BALL GEN_LATEST // Since Gen 4, Shedinja requires a Poké Ball for its evolution. In Gen 3, Shedinja inherits Nincada's Ball.

19
src/pokedex.c
View file

@ -868,7 +868,11 @@ static const struct WindowTemplate sPokemonList_WindowTemplate[] =
DUMMY_WIN_TEMPLATE DUMMY_WIN_TEMPLATE
}; };
#if P_DEX_FOUR_DIGITS_AMOUNT == TRUE
static const u8 sText_No000[] = _("{NO}0000");
#else
static const u8 sText_No000[] = _("{NO}000"); static const u8 sText_No000[] = _("{NO}000");
#endif
static const u8 sCaughtBall_Gfx[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp"); static const u8 sCaughtBall_Gfx[] = INCBIN_U8("graphics/pokedex/caught_ball.4bpp");
static const u8 sText_TenDashes[] = _("----------"); static const u8 sText_TenDashes[] = _("----------");
@ -2547,16 +2551,27 @@ static void CreateMonListEntry(u8 position, u16 b, u16 ignored)
static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused) static void CreateMonDexNum(u16 entryNum, u8 left, u8 top, u16 unused)
{ {
#if P_DEX_FOUR_DIGITS_AMOUNT == TRUE
u8 text[7];
#else
u8 text[6]; u8 text[6];
#endif
u16 dexNum; u16 dexNum;
memcpy(text, sText_No000, ARRAY_COUNT(text)); memcpy(text, sText_No000, ARRAY_COUNT(text));
dexNum = sPokedexView->pokedexList[entryNum].dexNum; dexNum = sPokedexView->pokedexList[entryNum].dexNum;
if (sPokedexView->dexMode == DEX_MODE_HOENN) if (sPokedexView->dexMode == DEX_MODE_HOENN)
dexNum = NationalToHoennOrder(dexNum); dexNum = NationalToHoennOrder(dexNum);
#if P_DEX_FOUR_DIGITS_AMOUNT == TRUE
text[2] = CHAR_0 + dexNum / 1000;
text[3] = CHAR_0 + (dexNum % 1000) / 100;
text[4] = CHAR_0 + (dexNum % 100) / 10;
text[5] = CHAR_0 + (dexNum % 10);
#else
text[2] = CHAR_0 + dexNum / 100; text[2] = CHAR_0 + dexNum / 100;
text[3] = CHAR_0 + (dexNum % 100) / 10; text[3] = CHAR_0 + (dexNum % 100) / 10;
text[4] = CHAR_0 + (dexNum % 100) % 10; text[4] = CHAR_0 + (dexNum % 100) % 10;
#endif
PrintMonDexNumAndName(0, FONT_NARROW, text, left, top); PrintMonDexNumAndName(0, FONT_NARROW, text, left, top);
} }
@ -4244,7 +4259,11 @@ static void PrintMonInfo(u32 num, u32 value, u32 owned, u32 newEntry)
value = SpeciesToHoennPokedexNum(num); value = SpeciesToHoennPokedexNum(num);
else else
value = SpeciesToNationalPokedexNum(num); value = SpeciesToNationalPokedexNum(num);
#if P_DEX_FOUR_DIGITS_AMOUNT == TRUE
ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 4);
#else
ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 3); ConvertIntToDecimalStringN(StringCopy(str, gText_NumberClear01), value, STR_CONV_MODE_LEADING_ZEROS, 3);
#endif
PrintInfoScreenText(str, 0x60, 0x19); PrintInfoScreenText(str, 0x60, 0x19);
name = GetSpeciesName(num); name = GetSpeciesName(num);
PrintInfoScreenText(name, 0x84, 0x19); PrintInfoScreenText(name, 0x84, 0x19);