From 8fd30813062f9588529461f44df333a6bcfde411 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 18 Nov 2017 16:11:34 +0100 Subject: start working on berry blender --- include/new_menu_helpers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index 42b8c60b1..c52184972 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -13,5 +13,6 @@ void DisplayItemMessageOnField(u8 taskId, 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); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From eb8055eb07f4ed6e3dd1d04d61e66ad9fb0d08b8 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 17 Dec 2017 20:10:57 +0100 Subject: battle 1 is decompiled --- include/new_menu_helpers.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index c52184972..dad819c51 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -14,5 +14,6 @@ void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); void sub_8197930(void); u8 GetPlayerTextSpeed(void); +void sub_81978B0(u16 arg0); #endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3 From 5a57485ece9686eadaf2a96365aa285587ab51af Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 23 Jan 2018 21:30:13 -0600 Subject: Decompile naming_screen.c --- include/new_menu_helpers.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h index dad819c51..5a4abeb85 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -4,6 +4,8 @@ #include "text.h" #include "task.h" +void sub_81971D0(void); +void sub_8197200(void); void sub_81973A4(void); void sub_81973C4(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); -- cgit v1.2.3 From 10037ac0e1c1737dc7cb309257369b17ccd5e028 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 24 Jan 2018 01:03:20 -0600 Subject: Fix spelling of '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 5a4abeb85..4b1e372c2 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -10,7 +10,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 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -- cgit v1.2.3 From 7d8a2ae7f0d9edaca7770cf472909bf9197acf2a Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Thu, 25 Jan 2018 15:25:35 -0600 Subject: Decompile new_menu_helpers.s --- 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 4b1e372c2..fb9a727dc 100644 --- a/include/new_menu_helpers.h +++ b/include/new_menu_helpers.h @@ -7,10 +7,10 @@ void sub_81971D0(void); void sub_8197200(void); void sub_81973A4(void); -void sub_81973C4(u8, u8); +void NewMenuHelpers_DrawDialogueFrame(u8, u8); void sub_819746C(u8 windowId, bool8 copyToVram); -void sub_81973FC(u8, u8); -u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor); +void NewMenuHelpers_DrawStdWindowFrame(u8, u8); +u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback); void sub_8197434(u8 a0, u8 a1); void SetStandardWindowBorderStyle(u8 a0, u8 a1); -- cgit v1.2.3 From d396a8f89caa2d47ae39f7dfa8da02017945d7f7 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 7 Feb 2018 00:07:42 -0600 Subject: Merge new_menu_helpers and menu --- include/new_menu_helpers.h | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 include/new_menu_helpers.h (limited to 'include/new_menu_helpers.h') diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h deleted file mode 100644 index fb9a727dc..000000000 --- a/include/new_menu_helpers.h +++ /dev/null @@ -1,21 +0,0 @@ -#ifndef GUARD_NEW_MENU_HELPERS_H -#define GUARD_NEW_MENU_HELPERS_H - -#include "text.h" -#include "task.h" - -void sub_81971D0(void); -void sub_8197200(void); -void sub_81973A4(void); -void NewMenuHelpers_DrawDialogueFrame(u8, u8); -void sub_819746C(u8 windowId, bool8 copyToVram); -void NewMenuHelpers_DrawStdWindowFrame(u8, u8); -u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void (*callback)(struct TextSubPrinter *, u16), u8 fgColor, u8 bgColor, u8 shadowColor); -void DisplayItemMessageOnField(u8 taskId, 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 sub_81978B0(u16 arg0); - -#endif // GUARD_NEW_MENU_HELPERS_H -- cgit v1.2.3