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

Automatically fix TM numbers over 100 in Bag menu (#8531)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-12-18 06:27:01 -03:00 committed by GitHub
parent 7f6869bcb5
commit e02fa053f6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/item_menu.c
View File

@ -937,7 +937,7 @@ static void GetItemNameFromPocket(u8 *dest, u16 itemId)
{
case POCKET_TM_HM:
end = StringCopy(gStringVar2, GetMoveName(ItemIdToBattleMoveId(itemId)));
PrependFontIdToFit(gStringVar2, end, FONT_NARROW, 61);
PrependFontIdToFit(gStringVar2, end, FONT_NARROW, NUM_TECHNICAL_MACHINES >= 100 ? 60 : 65);
if (GetItemTMHMIndex(itemId) > NUM_TECHNICAL_MACHINES)
{
// Get HM number
@ -947,7 +947,7 @@ static void GetItemNameFromPocket(u8 *dest, u16 itemId)
else
{
// Get TM number
ConvertIntToDecimalStringN(gStringVar1, GetItemTMHMIndex(itemId), STR_CONV_MODE_LEADING_ZEROS, 2);
ConvertIntToDecimalStringN(gStringVar1, GetItemTMHMIndex(itemId), STR_CONV_MODE_LEADING_ZEROS, NUM_TECHNICAL_MACHINES >= 100 ? 3 : 2);
StringExpandPlaceholders(dest, gText_NumberItem_TMBerry);
}
break;

2
src/strings.c
View File

@ -206,7 +206,7 @@ const u8 *const gPocketNamesStringsTable[] =
[POCKET_KEY_ITEMS] = COMPOUND_STRING("KEY ITEMS")
};
const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x07}{STR_VAR_2}");
const u8 gText_NumberItem_TMBerry[] = _("{NO}{STR_VAR_1}{CLEAR 0x03}{STR_VAR_2}");
const u8 gText_NumberItem_HM[] = _("{CLEAR_TO 0x11}{STR_VAR_1}{CLEAR 0x05}{STR_VAR_2}");
const u8 gText_ShopBuy[] = _("BUY");