From 4907ce6f7f5e8d73c32f6d8746ba64465502df03 Mon Sep 17 00:00:00 2001
From: Phlosioneer <mattmdrr2@gmail.com>
Date: Sun, 3 Mar 2019 02:50:40 -0500
Subject: Fully document move_tutor (formerly learn_move)

---
 include/field_screen_effect.h |  2 +-
 include/learn_move.h          |  7 -------
 include/list_menu.h           |  2 +-
 include/move_tutor.h          |  7 +++++++
 include/pokenav.h             | 10 +++++-----
 include/strings.h             | 16 ++++++++--------
 6 files changed, 22 insertions(+), 22 deletions(-)
 delete mode 100644 include/learn_move.h
 create mode 100644 include/move_tutor.h

(limited to 'include')

diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index 2b8b3a5a3..a1cf580cd 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -5,7 +5,7 @@ void pal_fill_for_maplights(void);
 void pal_fill_black(void);
 void WarpFadeScreen(void);
 void sub_80AF128(void);
-void sub_80AF168(void);
+void FieldCallback_ReturnToEventScript2(void);
 void sub_80AF188(void);
 void sub_80AF214(void);
 void sub_80AF2B4(u8 taskId);
diff --git a/include/learn_move.h b/include/learn_move.h
deleted file mode 100644
index 542ae6a5a..000000000
--- a/include/learn_move.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef GUARD_LEARN_MOVE_H
-#define GUARD_LEARN_MOVE_H
-
-void TeachMoveTutorMove(void);
-void ShowHideHearts(s32);
-
-#endif //GUARD_LEARN_MOVE_H
diff --git a/include/list_menu.h b/include/list_menu.h
index ef23688d8..a301e5b32 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -4,7 +4,7 @@
 #include "window.h"
 
 #define LIST_NOTHING_CHOSEN -1
-#define LIST_B_PRESSED -2
+#define LIST_CANCEL -2
 #define LIST_HEADER -3
 
 #define LIST_NO_MULTIPLE_SCROLL     0
diff --git a/include/move_tutor.h b/include/move_tutor.h
new file mode 100644
index 000000000..e3e5da1d4
--- /dev/null
+++ b/include/move_tutor.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_LEARN_MOVE_H
+#define GUARD_LEARN_MOVE_H
+
+void TeachMoveTutorMove(void);
+void MoveTutorShowHideHearts(s32);
+
+#endif //GUARD_LEARN_MOVE_H
diff --git a/include/pokenav.h b/include/pokenav.h
index e5dba8ae0..f80123757 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -20,11 +20,11 @@ void sub_81D1EC0(void);
 void sub_81D1D04(u8);
 bool8 sub_81D1C44(u8);
 bool8 sub_81D4A58(struct EventObject*);
-void sub_81D2BF4(u8 *);
-u16 sub_81D2C3C(void);
-void sub_81D2C50(void);
-u8 sub_81D28C8(const struct ListMenuItem *items, u16 numChoices);
-void sub_81D2824(u16);
+void MoveTutorPrintText(u8 *);
+u16 MoveTutorRunTextPrinters(void);
+void MoveTutorCreateYesNoMenu(void);
+u8 LoadMoveTutorMovesList(const struct ListMenuItem *items, u16 numChoices);
+void InitMoveTutorWindows(bool8 useContextWindow);
 bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 void sub_81D4998(void);
diff --git a/include/strings.h b/include/strings.h
index 3899b63aa..bd1a5349c 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -859,15 +859,15 @@ extern const u8 gText_Winona[];
 extern const u8 gText_Phoebe[];
 extern const u8 gText_Glacia[];
 
-extern const u8 gText_PkmnLearnedMove4[];
-extern const u8 gText_PkmnTryingToLearnMove[];
-extern const u8 gText_WhichMoveToForget2[];
-extern const u8 gText_StopTryingToTeachMove[];
-extern const u8 gText_12AndPoof[];
-extern const u8 gText_PkmnForgotMoveAndLearnedNew[];
+extern const u8 gText_MoveTutorPkmnLearnedMove[];
+extern const u8 gText_MoveTutorPkmnTryingToLearnMove[];
+extern const u8 gText_MoveTutorWhichMoveToForget[];
+extern const u8 gText_MoveTutorStopTryingToTeachMove[];
+extern const u8 gText_MoveTutorAndPoof[];
+extern const u8 gText_MoveTutorPkmnForgotMoveAndLearnedNew[];
 extern const u8 gText_TeachWhichMoveToPkmn[];
-extern const u8 gText_GiveUpTeachingNewMove[];
-extern const u8 gText_TeachX[];
+extern const u8 gText_MoveTutorGiveUp[];
+extern const u8 gText_MoveTutorTeachMoveConfirm[];
 
 extern const u8 gText_Kira[];
 extern const u8 gText_Amy[];
-- 
cgit v1.2.3