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

fixed more header issue

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-09 23:54:05 +08:00
parent eb1719afc6
commit 05371e5875
4 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/menu.h
+2
View File
@@ -55,6 +55,8 @@ s8 Menu_ProcessInput_other(void);
s8 Menu_ProcessInputNoWrapAround(void); s8 Menu_ProcessInputNoWrapAround(void);
s8 Menu_ProcessInput(void); s8 Menu_ProcessInput(void);
u8 Menu_GetCursorPos(void); u8 Menu_GetCursorPos(void);
u8 Menu_MoveCursorNoWrapAround(s8 cursorDelta);
u8 Menu_MoveCursor(s8 cursorDelta);
u8 Menu_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos); u8 Menu_InitCursor(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos);
u8 Menu_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos, bool8 APressMuted); u8 Menu_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 cursorHeight, u8 numChoices, u8 initialCursorPos, bool8 APressMuted);
void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram); void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram);
include/menu_helpers.h
+2 -1
View File
@@ -4,7 +4,8 @@
#include "global.h" #include "global.h"
#include "task.h" #include "task.h"
struct YesNoFuncTable { struct YesNoFuncTable
{
TaskFunc yesFunc; TaskFunc yesFunc;
TaskFunc noFunc; TaskFunc noFunc;
}; };
include/new_menu_helpers.h
-2
View File
@@ -48,7 +48,5 @@ void sub_80F7974(const u8 * text);
void sub_80F7998(void); void sub_80F7998(void);
void sub_80F79A4(void); void sub_80F79A4(void);
void SetDefaultFontsPointer(void); void SetDefaultFontsPointer(void);
u8 GetFontAttribute(u8 fontId, u8 attributeId);
u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
#endif // GUARD_NEW_MENU_HELPERS_H #endif // GUARD_NEW_MENU_HELPERS_H
src/menu.c
+1 -6
View File
@@ -47,8 +47,6 @@ static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLef
static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum); static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum); static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY); static u8 MultichoiceGridComputeNewCursorPos(s8 deltaX, s8 deltaY);
u8 Menu_MoveCursor(s8 cursorDelta);
void DestroyYesNoMenu(void);
void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum) void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 tileNum, u8 paletteNum)
{ {
@@ -213,7 +211,6 @@ void TopBarWindowPrintString(const u8 *string, u8 unUsed, bool8 copyToVram)
} }
} }
void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram) void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgColorChooser, u8 notUsed, bool8 copyToVram)
{ {
struct TextColor color; struct TextColor color;
@@ -308,7 +305,7 @@ static u8 sub_810F818(u8 windowId, u8 fontId, u8 left, u8 top, u8 numChoices, u8
return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos); return Menu_InitCursor(windowId, fontId, left, top, GetMenuCursorDimensionByFont(fontId, 1), numChoices, initialCursorPos);
} }
void RedrawMenuCursor(u8 oldPos, u8 newPos) static void RedrawMenuCursor(u8 oldPos, u8 newPos)
{ {
u8 width, height; u8 width, height;
@@ -480,9 +477,7 @@ void PrintMultichoiceListItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineH
u8 i; u8 i;
for (i = 0; i < itemCount; i++) for (i = 0; i < itemCount; i++)
{
AddTextPrinterParameterized5(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, letterSpacing, lineSpacing); AddTextPrinterParameterized5(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, letterSpacing, lineSpacing);
}
CopyWindowToVram(windowId, 2); CopyWindowToVram(windowId, 2);
} }