dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update some more names in help system

Browse Source
This commit is contained in:
PikalaxALT
2021-03-23 13:52:14 -04:00
parent 10a96540ff
commit 56b37fef8d
3 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/help_system.h
+3 -3
View File
@@ -76,8 +76,8 @@ void HS_ShowOrHideHeaderLine_Darker_FooterStyle(u8 mode);
void HS_ShowOrHideScrollArrows(u8 which, u8 mode); void HS_ShowOrHideScrollArrows(u8 which, u8 mode);
void HelpSystem_PrintTextRightAlign_Row52(const u8 *str); void HelpSystem_PrintTextRightAlign_Row52(const u8 *str);
void HelpSystem_PrintTextAt(const u8 *, u8, u8); void HelpSystem_PrintTextAt(const u8 *, u8, u8);
void HelpSystem_PrintTwoStrings(const u8 *a0, const u8 *a1); void HelpSystem_PrintQuestionAndAnswerPair(const u8 *a0, const u8 *a1);
void HelpSystem_PrintText_813C584(const u8 *str); void HelpSystem_PrintTopicMouseoverDescription(const u8 *str);
void HelpSystem_FillPanel2(void); void HelpSystem_FillPanel2(void);
void HelpSystem_FillPanel1(void); void HelpSystem_FillPanel1(void);
void HelpSystem_InitListMenuController(struct HelpSystemListMenu *, u8, u8); void HelpSystem_InitListMenuController(struct HelpSystemListMenu *, u8, u8);
@@ -86,7 +86,7 @@ s32 HelpSystem_GetMenuInput(void);
void HS_UpdateMenuScrollArrows(void); void HS_UpdateMenuScrollArrows(void);
void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height); void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct Bitmap *destBlit, u8 *destBuffer, u8 x, u8 y, u8 width, u8 height);
void HelpSystem_PrintText_Row61(const u8 * str); void HelpSystem_PrintTextInTopLeftCorner(const u8 * str);
void HelpSystem_FillPanel3(void); void HelpSystem_FillPanel3(void);
void PrintListMenuItems(void); void PrintListMenuItems(void);
void PlaceListMenuCursor(void); void PlaceListMenuCursor(void);
src/help_system.c
+7 -7
View File
@@ -2399,23 +2399,23 @@ bool8 HelpMenuSubroutine_HelpItemPrint(struct HelpSystemListMenu * helpListMenu,
if (gHelpSystemState.topic == TOPIC_WHAT_TO_DO) if (gHelpSystemState.topic == TOPIC_WHAT_TO_DO)
{ {
HelpSystem_PrintTwoStrings(sHelpSystemSpecializedQuestionTextPtrs[gHelpSystemState.scrollSub], sHelpSystemSpecializedAnswerTextPtrs[gHelpSystemState.scrollSub]); HelpSystem_PrintQuestionAndAnswerPair(sHelpSystemSpecializedQuestionTextPtrs[gHelpSystemState.scrollSub], sHelpSystemSpecializedAnswerTextPtrs[gHelpSystemState.scrollSub]);
} }
else if (gHelpSystemState.topic == TOPIC_HOW_TO_DO) else if (gHelpSystemState.topic == TOPIC_HOW_TO_DO)
{ {
HelpSystem_PrintTwoStrings(sHelpSystemMenuTopicTextPtrs[gHelpSystemState.scrollSub], sHelpSystemHowToUseMenuTextPtrs[gHelpSystemState.scrollSub]); HelpSystem_PrintQuestionAndAnswerPair(sHelpSystemMenuTopicTextPtrs[gHelpSystemState.scrollSub], sHelpSystemHowToUseMenuTextPtrs[gHelpSystemState.scrollSub]);
} }
else if (gHelpSystemState.topic == TOPIC_TERMS) else if (gHelpSystemState.topic == TOPIC_TERMS)
{ {
HelpSystem_PrintTwoStrings(sHelpSystemTermTextPtrs[gHelpSystemState.scrollSub], sHelpSystemTermDefinitionsTextPtrs[gHelpSystemState.scrollSub]); HelpSystem_PrintQuestionAndAnswerPair(sHelpSystemTermTextPtrs[gHelpSystemState.scrollSub], sHelpSystemTermDefinitionsTextPtrs[gHelpSystemState.scrollSub]);
} }
else if (gHelpSystemState.topic == TOPIC_ABOUT_GAME) else if (gHelpSystemState.topic == TOPIC_ABOUT_GAME)
{ {
HelpSystem_PrintTwoStrings(sHelpSystemGeneralTopicTextPtrs[gHelpSystemState.scrollSub], sHelpSystemGeneralTopicDescriptionTextPtrs[gHelpSystemState.scrollSub]); HelpSystem_PrintQuestionAndAnswerPair(sHelpSystemGeneralTopicTextPtrs[gHelpSystemState.scrollSub], sHelpSystemGeneralTopicDescriptionTextPtrs[gHelpSystemState.scrollSub]);
} }
else // TOPIC_TYPE_MATCHUP else // TOPIC_TYPE_MATCHUP
{ {
HelpSystem_PrintTwoStrings(sHelpSystemTypeMatchupTextPtrs[gHelpSystemState.scrollSub], sHelpSystemTypeMatchupDescriptionTextPtrs[gHelpSystemState.scrollSub]); HelpSystem_PrintQuestionAndAnswerPair(sHelpSystemTypeMatchupTextPtrs[gHelpSystemState.scrollSub], sHelpSystemTypeMatchupDescriptionTextPtrs[gHelpSystemState.scrollSub]);
} }
HS_ShowOrHideMainWindowText(1); HS_ShowOrHideMainWindowText(1);
HS_ShowOrHideControlsGuideInTopRight(1); HS_ShowOrHideControlsGuideInTopRight(1);
@@ -2473,8 +2473,8 @@ static void PrintHelpSystemTopicMouseoverDescription(struct HelpSystemListMenu *
{ {
s32 index = listMenuItemsBuffer[helpListMenu->itemsAbove + helpListMenu->cursorPos].index; s32 index = listMenuItemsBuffer[helpListMenu->itemsAbove + helpListMenu->cursorPos].index;
if (index == -2) if (index == -2)
HelpSystem_PrintText_813C584(sHelpSystemTopicMouseoverDescriptionPtrs[5]); HelpSystem_PrintTopicMouseoverDescription(sHelpSystemTopicMouseoverDescriptionPtrs[5]);
else else
HelpSystem_PrintText_813C584(sHelpSystemTopicMouseoverDescriptionPtrs[index]); HelpSystem_PrintTopicMouseoverDescription(sHelpSystemTopicMouseoverDescriptionPtrs[index]);
HS_ShowOrHideToplevelTooltipWindow(1); HS_ShowOrHideToplevelTooltipWindow(1);
} }
src/help_system_util.c
+6 -6
View File
@@ -84,7 +84,7 @@ u8 RunHelpSystemCallback(void)
HS_BufferFillMapWithTile1FF(); HS_BufferFillMapWithTile1FF();
HelpSystem_FillPanel3(); HelpSystem_FillPanel3();
HelpSystem_FillPanel2(); HelpSystem_FillPanel2();
HelpSystem_PrintText_Row61(gString_Help); HelpSystem_PrintTextInTopLeftCorner(gString_Help);
HS_ShowOrHideWordHELPinTopLeft(1); HS_ShowOrHideWordHELPinTopLeft(1);
if (HelpSystem_UpdateHasntSeenIntro() == TRUE) if (HelpSystem_UpdateHasntSeenIntro() == TRUE)
HelpSystemSubroutine_PrintWelcomeMessage(&gHelpSystemListMenu, gHelpSystemListMenuItems); HelpSystemSubroutine_PrintWelcomeMessage(&gHelpSystemListMenu, gHelpSystemListMenuItems);
@@ -580,7 +580,7 @@ void DecompressAndRenderGlyph(u8 font, u16 glyph, struct Bitmap *srcBlit, struct
BlitBitmapRect4Bit(srcBlit, destBlit, 0, 0, x, y, gGlyphInfo.width, gGlyphInfo.height, 0); BlitBitmapRect4Bit(srcBlit, destBlit, 0, 0, x, y, gGlyphInfo.width, gGlyphInfo.height, 0);
} }
void HelpSystem_PrintText_Row61(const u8 * str) void HelpSystem_PrintTextInTopLeftCorner(const u8 * str)
{ {
GenerateFontHalfRowLookupTable(1, 15, 2); GenerateFontHalfRowLookupTable(1, 15, 2);
HelpSystemRenderText(5, gDecompressionBuffer + 0x3D00, str, 6, 2, 7, 2); HelpSystemRenderText(5, gDecompressionBuffer + 0x3D00, str, 6, 2, 7, 2);
@@ -599,15 +599,15 @@ void HelpSystem_PrintTextAt(const u8 * str, u8 x, u8 y)
HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, str, x, y, 26, 16); HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, str, x, y, 26, 16);
} }
void HelpSystem_PrintTwoStrings(const u8 * str1, const u8 * str2) void HelpSystem_PrintQuestionAndAnswerPair(const u8 * question, const u8 * answer)
{ {
CpuFill16(0xEEEE, gDecompressionBuffer + 0x0000, 0x3400); CpuFill16(0xEEEE, gDecompressionBuffer + 0x0000, 0x3400);
GenerateFontHalfRowLookupTable(1, 14, 2); GenerateFontHalfRowLookupTable(1, 14, 2);
HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, str1, 0, 0, 26, 16); HelpSystemRenderText(2, gDecompressionBuffer + 0x0000, question, 0, 0, 26, 16);
HelpSystemRenderText(2, gDecompressionBuffer + 0x09C0, str2, 0, 0, 26, 13); HelpSystemRenderText(2, gDecompressionBuffer + 0x09C0, answer, 0, 0, 26, 13);
} }
void HelpSystem_PrintText_813C584(const u8 * str) void HelpSystem_PrintTopicMouseoverDescription(const u8 * str)
{ {
CpuFill16(0x1111, gDecompressionBuffer + 0x23C0, 0x1040); CpuFill16(0x1111, gDecompressionBuffer + 0x23C0, 0x1040);
GenerateFontHalfRowLookupTable(2, 1, 3); GenerateFontHalfRowLookupTable(2, 1, 3);