From e73ce5317dfc243474faa9187181ed323faf4ed5 Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:05:30 -0400 Subject: Parametrized to Parameterized --- include/new_menu_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index b3daf43c6..e9b41d778 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -9,7 +9,7 @@ void sub_81973A4(void); void sub_81973C4(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); void sub_81973FC(u8, u8); -u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); +u16 AddTextPrinterParameterized3(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -- cgit v1.2.3 From b249154009efceb5710848a2567fb821d3e7217a Mon Sep 17 00:00:00 2001 From: garak Date: Thu, 30 May 2019 17:44:48 -0400 Subject: synchronize text printer function names with pokeemerald --- include/new_menu_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index e9b41d778..929147c0c 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -9,7 +9,7 @@ void sub_81973A4(void); void sub_81973C4(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); void sub_81973FC(u8, u8); -u16 AddTextPrinterParameterized3(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); +u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -- cgit v1.2.3 From 2b750cf44491aee3b2fe8265afb4ac6620500afa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Jun 2019 10:21:32 -0400 Subject: Rename Item PC symbols --- include/new_menu_helpers.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 929147c0c..ed933089f 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -29,7 +29,7 @@ void ResetBg0(void); void Menu_LoadStdPalAt(u16); void * malloc_and_decompress(const void * src, u32 * size); u16 sub_80F796C(void); -void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); +void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); -- cgit v1.2.3 From efad45497dfb69cf2879d0bf2e318eaf8fc2252f Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 24 Jun 2019 14:37:45 +0800 Subject: through AddTextPrinterParameterized2() --- include/new_menu_helpers.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index ed933089f..bd39480d2 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -9,7 +9,7 @@ void sub_81973A4(void); void sub_81973C4(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); void sub_81973FC(u8, u8); -u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); +u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); @@ -22,12 +22,12 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer); void sub_80F7974(const u8 *); u8 GetStartMenuWindowId(void); void sub_80F7998(void); -void sub_80F69E8(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DrawStdWindowFrame(u8 windowId, bool8 copyNow); void InitStandardTextBoxWindows(void); void ResetBg0(void); void Menu_LoadStdPalAt(u16); -void * malloc_and_decompress(const void * src, u32 * size); +void * MallocAndDecompress(const void * src, u32 * size); u16 sub_80F796C(void); void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4); -- cgit v1.2.3 From cc937d33b4ae33312d543269f78207037f86b4c3 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 04:51:59 +0800 Subject: thru WindowFunc_ClearDialogWindowAndFrame() --- include/new_menu_helpers.h | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index bd39480d2..30728ec09 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -22,15 +22,22 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer); void sub_80F7974(const u8 *); u8 GetStartMenuWindowId(void); void sub_80F7998(void); -void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DrawStdWindowFrame(u8 windowId, bool8 copyNow); void InitStandardTextBoxWindows(void); void ResetBg0(void); +void ResetBgPositions(void); +void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); +void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); +void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void Menu_LoadStdPalAt(u16); void * MallocAndDecompress(const void * src, u32 * size); u16 sub_80F796C(void); -void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); -void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); +void sub_80F77B8(void); +void sub_80F6E9C(void); +void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); +void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress); +void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 0d46c60b383d5feca05950e57bb05dc392f815cc Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 05:47:01 +0800 Subject: thru DisplayYesNoMenuDefaultNo() --- include/new_menu_helpers.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 30728ec09..b817bc643 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -30,14 +30,19 @@ void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 heigh void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void Menu_LoadStdPal(void); void Menu_LoadStdPalAt(u16); void * MallocAndDecompress(const void * src, u32 * size); u16 sub_80F796C(void); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); -void sub_80F77B8(void); void sub_80F6E9C(void); +void sub_80F771C(bool8 copyToVram); void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress); void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); +void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram); +void sub_80F7768(u8 windowId, bool8 copyToVram); +void DisplayYesNoMenuDefaultYes(void); +void DisplayYesNoMenuDefaultNo(void); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 2a870d54fca85b6f4501cff857837c3f2940fd7d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 25 Jun 2019 06:50:48 +0800 Subject: All Done --- include/new_menu_helpers.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index b817bc643..caa7cfc3c 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -19,9 +19,9 @@ void ClearDialogWindowAndFrame(u8, u8); u8 GetTextSpeedSetting(void); void sub_80F6E9C(void); void DrawDialogueFrame(u8 windowId, bool8 transfer); -void sub_80F7974(const u8 *); -u8 GetStartMenuWindowId(void); +void sub_80F7974(const u8 * text); void sub_80F7998(void); +void sub_80F79A4(void); void DrawStdWindowFrame(u8 windowId, bool8 copyNow); void InitStandardTextBoxWindows(void); void ResetBg0(void); @@ -33,7 +33,7 @@ void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 of void Menu_LoadStdPal(void); void Menu_LoadStdPalAt(u16); void * MallocAndDecompress(const void * src, u32 * size); -u16 sub_80F796C(void); +u16 GetStdWindowBaseTileNum(void); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); void sub_80F6E9C(void); void sub_80F771C(bool8 copyToVram); @@ -44,5 +44,9 @@ void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram); void sub_80F7768(u8 windowId, bool8 copyToVram); void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultNo(void); +u8 sub_80F78E0(u8 windowId); +u8 GetStartMenuWindowId(void); +void RemoveStartMenuWindow(void); +void SetDefaultFontsPointer(void); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 1a5d41b8050fa943069c8b6a240327411fcbfe80 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 9 Jul 2019 14:54:17 +0800 Subject: updated new_menu_helpers.h --- include/new_menu_helpers.h | 62 ++++++++++++++++++++++++---------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index caa7cfc3c..c52741d92 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -5,48 +5,50 @@ #include "text.h" #include "task.h" -void sub_81973A4(void); -void sub_81973C4(u8, u8); -void sub_819746C(u8 windowId, bool8 copyToVram); -void sub_81973FC(u8, u8); +void ClearScheduledBgCopiesToVram(void); +void ScheduleBgCopyTilemapToVram(u8 bgId); +void DoScheduledBgTilemapCopiesToVram(void); +void ResetTempTileDataBuffers(void); +bool8 FreeTempTileDataBuffersIfPossible(void); +void *DecompressAndCopyTileDataToVram(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void *DecompressAndCopyTileDataToVram2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); +void * MallocAndDecompress(const void * src, u32 * size); +void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); +void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); +void ResetBgPositions(void); +void InitStandardTextBoxWindows(void); +void FreeAllOverworldWindowBuffers(void); +void ResetBg0(void); +u16 RunTextPrinters_CheckPrinter0Active(void); u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); -void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback); -void sub_8197434(u8 a0, u8 a1); -void SetStandardWindowBorderStyle(u8 a0, u8 a1); -void sub_8197930(void); -u8 GetPlayerTextSpeed(void); -void ClearDialogWindowAndFrame(u8, u8); -u8 GetTextSpeedSetting(void); +void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress); +void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); +void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); void sub_80F6E9C(void); void DrawDialogueFrame(u8 windowId, bool8 transfer); -void sub_80F7974(const u8 * text); -void sub_80F7998(void); -void sub_80F79A4(void); void DrawStdWindowFrame(u8 windowId, bool8 copyNow); -void InitStandardTextBoxWindows(void); -void ResetBg0(void); -void ResetBgPositions(void); -void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height); -void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette); -void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); -void DecompressAndLoadBgGfxUsingHeap2(u8 bgId, const void *src, u32 size, u16 offset, u8 mode); -void Menu_LoadStdPal(void); -void Menu_LoadStdPalAt(u16); -void * MallocAndDecompress(const void * src, u32 * size); -u16 GetStdWindowBaseTileNum(void); +void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram); void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow); -void sub_80F6E9C(void); void sub_80F771C(bool8 copyToVram); -void AddTextPrinterWithCustomSpeedForMessage(bool8 allowSkippingDelayWithButtonPress, u8 speed); -void AddTextPrinterDiffStyle(bool8 allowSkippingDelayWithButtonPress); -void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress); void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram); void sub_80F7768(u8 windowId, bool8 copyToVram); +void Menu_LoadStdPal(void); +void Menu_LoadStdPalAt(u16 offset); +void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback); void DisplayYesNoMenuDefaultYes(void); void DisplayYesNoMenuDefaultNo(void); -u8 sub_80F78E0(u8 windowId); +u8 GetTextSpeedSetting(void); +u8 sub_80F78E0(u8 height); u8 GetStartMenuWindowId(void); void RemoveStartMenuWindow(void); +u16 GetStdWindowBaseTileNum(void); +void sub_80F7974(const u8 * text); +void sub_80F7998(void); +void sub_80F79A4(void); void SetDefaultFontsPointer(void); +u8 GetFontAttribute(u8 fontId, u8 attributeId); +u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 05371e58753668147ec9e4d4bd161e5a044c058b Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 9 Jul 2019 23:54:05 +0800 Subject: fixed more header issue --- include/new_menu_helpers.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index c52741d92..d68957e62 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -48,7 +48,5 @@ void sub_80F7974(const u8 * text); void sub_80F7998(void); void sub_80F79A4(void); void SetDefaultFontsPointer(void); -u8 GetFontAttribute(u8 fontId, u8 attributeId); -u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3