From 7d8a2ae7f0d9edaca7770cf472909bf9197acf2a Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
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 <diego@domoreaweso.me>
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