Leahnaya/pokefirered
1
0
Fork 0
mirror of https://github.com/pret/pokefirered.git synced 2026-05-09 12:35:23 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed summary name lengths

Browse Source
This commit is contained in:
cawtds 2024-06-21 21:23:50 +02:00
parent 9611e65f24
commit 59cd3ecf1f
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
graphics/summary_screen/page_skills.bin
View File

Binary file not shown.

2
include/config/debug.h
View File

@ -2,7 +2,7 @@
#define GUARD_CONFIG_DEBUG_H
// Overworld Debug
#define DEBUG_OVERWORLD_MENU FALSE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
#define DEBUG_OVERWORLD_MENU TRUE // Enables an overworld debug menu to change flags, variables, giving pokemon and more, accessed by holding R and pressing START while in the overworld by default.
#define DEBUG_OVERWORLD_HELD_KEYS (R_BUTTON) // The keys required to be held to open the debug menu.
#define DEBUG_OVERWORLD_TRIGGER_EVENT pressedStartButton // The event that opens the menu when holding the key(s) defined in DEBUG_OVERWORLD_HELD_KEYS.
#define DEBUG_OVERWORLD_IN_MENU FALSE // Replaces the overworld debug menu button combination with a start menu entry (above Pokédex).

2
include/constants/global.h
View File

@ -71,7 +71,7 @@
#define PLAYER_NAME_LENGTH 7
#define MAIL_WORDS_COUNT 9
#define EASY_CHAT_BATTLE_WORDS_COUNT 6
#define MOVE_NAME_LENGTH 12
#define MOVE_NAME_LENGTH ((B_EXPANDED_MOVE_NAMES == TRUE) ? 16 : 12)
#define NUM_QUESTIONNAIRE_WORDS 4
#define WONDER_CARD_TEXT_LENGTH 40
#define WONDER_NEWS_TEXT_LENGTH 40

10
src/pokemon_summary_screen.c
View File

@ -184,7 +184,7 @@ struct PokemonSummaryScreenData
u8 ALIGNED(4) expPointsStrBuf[9];
u8 ALIGNED(4) expToNextLevelStrBuf[9];
u8 ALIGNED(4) abilityNameStrBuf[ABILITY_NAME_LENGTH];
u8 ALIGNED(4) abilityNameStrBuf[ABILITY_NAME_LENGTH + 1];
u8 ALIGNED(4) abilityDescStrBuf[52];
} summary;
@ -2715,7 +2715,7 @@ static void PokeSum_PrintMoveName(u8 i)
if (i == 4)
curPP = maxPP;
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 3, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_RIGHT_PANE], FONT_NORMAL, 0, GetMoveNamePrinterYpos(i), sPrintMoveTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.moveNameStrBufs[i]);
if (sMonSummaryScreen->moveIds[i] == 0 || (curPP == maxPP))
colorIdx = 0;
@ -3017,12 +3017,12 @@ static void PokeSum_PrintTrainerMemo_Egg(void)
static void PokeSum_PrintExpPoints_NextLv(void)
{
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
26, 7,
9, 7,
sLevelNickTextColors[0], TEXT_SKIP_DRAW,
gText_PokeSum_ExpPoints);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[POKESUM_WIN_TRAINER_MEMO], FONT_NORMAL,
26, 20,
9, 20,
sLevelNickTextColors[0], TEXT_SKIP_DRAW,
gText_PokeSum_NextLv);
}
@ -3075,7 +3075,7 @@ static void PokeSum_PrintAbilityNameAndDesc(void)
FillWindowPixelBuffer(sMonSummaryScreen->windowIds[5], 0);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
66, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf);
49, 1, sLevelNickTextColors[0], TEXT_SKIP_DRAW, sMonSummaryScreen->summary.abilityNameStrBuf);
AddTextPrinterParameterized3(sMonSummaryScreen->windowIds[5], FONT_NORMAL,
2, 15, sLevelNickTextColors[0], TEXT_SKIP_DRAW,