Merge pull request #595 from Phlosioneer/move-tutor

Move tutor

10 files changed, 82 insertions, 41 deletions

diff --git a/include/contest_effect.h b/include/contest_effect.h
index 5f48e1b8b..0474cb38c 100644
--- a/include/contest_effect.h
+++ b/include/contest_effect.h
@@ -19,6 +19,7 @@ struct ContestEffect
 extern const struct ContestMove gContestMoves[];
 extern const struct ContestEffect gContestEffects[];
 extern const u8 *const gContestEffectDescriptionPointers[];
+extern const u8 *const gContestMoveTypeTextPointers[];
 
 bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove);
 
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index b4429c167..a62a76b2a 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/menu.h b/include/menu.h
index 947f97a68..e236ffcfa 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -31,7 +31,7 @@ u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed
 void PrintPlayerNameOnWindow(u8, const u8*, u16, u16);
 void DisplayItemMessageOnField(u8 taskId, const u8 *src, TaskFunc callback);
 void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
-void SetStandardWindowBorderStyle(u8 a0, u8 a1);
+void SetStandardWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void DisplayYesNoMenuDefaultYes(void);
 u32 GetPlayerTextSpeed(void);
 u8 GetPlayerTextSpeedDelay(void);
diff --git a/include/menu_specialized.h b/include/menu_specialized.h
new file mode 100644
index 000000000..e43ea024c
--- /dev/null
+++ b/include/menu_specialized.h
@@ -0,0 +1,53 @@
+#ifndef GUARD_MENU_SPECIALIZED_H
+#define GUARD_MENU_SPECIALIZED_H
+
+#include "player_pc.h"
+#include "list_menu.h"
+#include "pokemon.h"
+
+struct UnknownSubStruct_81D1ED4
+{
+    u16 unk0;
+    u16 unk2;
+};
+
+struct UnknownStruct_81D1ED4
+{
+    u8 unk0[4][5];
+    struct UnknownSubStruct_81D1ED4 unk14[4][5];
+    struct UnknownSubStruct_81D1ED4 unk64[10][5];
+    struct UnknownSubStruct_81D1ED4 unk12C[5];
+    struct UnknownSubStruct_81D1ED4 unk13C[0x42];
+    struct UnknownSubStruct_81D1ED4 unk248[0x42];
+    u16 unk350;
+    u16 unk352;
+    u8 unk354;
+    u8 unk355;
+    u8 unk356[0x22];
+};
+
+bool8 sub_81D1C44(u8 count);
+u8 sub_81D1C84(u8 a0);
+u8 sub_81D1DC0(struct PlayerPCItemPageStruct *page);
+void sub_81D1E90(struct PlayerPCItemPageStruct *page);
+void sub_81D1EC0(void);
+void sub_81D1D04(u8 a0);
+void DrawLevelUpWindowPg1(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5);
+void DrawLevelUpWindowPg2(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4);
+void sub_81D1ED4(struct UnknownStruct_81D1ED4 *a0);
+void sub_81D2108(struct UnknownStruct_81D1ED4 *arg0);
+void sub_81D20AC(struct UnknownStruct_81D1ED4 *arg0);
+void sub_81D2230(struct UnknownStruct_81D1ED4 *arg0);
+bool8 sub_81D20BC(struct UnknownStruct_81D1ED4 *arg0);
+void sub_81D3464(void *arg0);
+void sub_81D3480(void *arg0, u8 arg1);
+void sub_81D2754(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 *arg1);
+void sub_81D1F84(struct UnknownStruct_81D1ED4 *arg0, struct UnknownSubStruct_81D1ED4 arg1[4][5], struct UnknownSubStruct_81D1ED4 arg2[4][5]);
+void MoveRelearnerPrintText(u8 *str);
+bool16 MoveRelearnerRunTextPrinters(void);
+void MoveRelearnerCreateYesNoMenu(void);
+u8 LoadMoveRelearnerMovesList(const struct ListMenuItem *items, u16 numChoices);
+void InitMoveRelearnerWindows(bool8 useContextWindow);
+void GetMonLevelUpWindowStats(struct Pokemon* mon, void* statStoreLocation);
+
+#endif // GUARD_MENU_SPECIALIZED_H
\ No newline at end of file
diff --git a/include/move_relearner.h b/include/move_relearner.h
new file mode 100644
index 000000000..51b476d25
--- /dev/null
+++ b/include/move_relearner.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_MOVE_RELEARNER_H
+#define GUARD_MOVE_RELEARNER_H
+
+void TeachMoveRelearnerMove(void);
+void MoveRelearnerShowHideHearts(s32);
+
+#endif //GUARD_MOVE_RELEARNER_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index bd99fed0e..19994b77f 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -1,7 +1,10 @@
 #ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
 #define GUARD_POKEMON_SUMMARY_SCREEN_H
 
+#include "main.h"
+
 extern u8 gLastViewedMonIndex;
+extern const u8 *const gMoveDescriptionPointers[];
 
 void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 void sub_81C4F98(u8, void(*)(void));
diff --git a/include/pokenav.h b/include/pokenav.h
index 29ccaec3e..55bfb366c 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -1,35 +1,12 @@
 #ifndef GUARD_POKENAV_H
 #define GUARD_POKENAV_H
-#include "player_pc.h"
 #include "list_menu.h"
 
-bool8 sub_81D20BC(void *arg0);
 bool8 sub_81D312C(void *arg0);
-void sub_81D1ED4(void *arg0);
-void sub_81D2108(void *arg0);
-void sub_81D20AC(void *arg0);
-void sub_81D2230(void *arg0);
-void sub_81D3464(void *arg0);
-void sub_81D3480(void *arg0, u8 arg1);
-void sub_81D2754(void *arg0, void *arg1);
-void sub_81D1F84(void *arg0, void *arg1, void *arg2);
-u8 sub_81D1C84(u8);
-u8 sub_81D1DC0(struct PlayerPCItemPageStruct *);
-void sub_81D1E90(struct PlayerPCItemPageStruct *);
-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);
 bool8 EventObjectIsFarawayIslandMew(struct EventObject *);
 u32 sub_81D427C(void);
 void sub_81D4998(void);
-void sub_81D3640(u16 arg0, void* statStoreLocation1, void* statStoreLocation2, u8 arg3, u8 arg4, u8 arg5);
-void sub_81D3784(u16 arg0, void* statStoreLocation1, u8 arg2, u8 arg3, u8 arg4);
 void CB2_InitPokeNav(void);
 
 #endif //GUARD_POKENAV_H
diff --git a/include/strings.h b/include/strings.h
index 3899b63aa..9e464562d 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -859,15 +859,22 @@ 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_MoveRelearnerPkmnLearnedMove[];
+extern const u8 gText_MoveRelearnerPkmnTryingToLearnMove[];
+extern const u8 gText_MoveRelearnerWhichMoveToForget[];
+extern const u8 gText_MoveRelearnerStopTryingToTeachMove[];
+extern const u8 gText_MoveRelearnerAndPoof[];
+extern const u8 gText_MoveRelearnerPkmnForgotMoveAndLearnedNew[];
 extern const u8 gText_TeachWhichMoveToPkmn[];
-extern const u8 gText_GiveUpTeachingNewMove[];
-extern const u8 gText_TeachX[];
+extern const u8 gText_MoveRelearnerGiveUp[];
+extern const u8 gText_MoveRelearnerTeachMoveConfirm[];
+extern const u8 gText_MoveRelearnerBattleMoves[];
+extern const u8 gText_MoveRelearnerPP[];
+extern const u8 gText_MoveRelearnerPower[];
+extern const u8 gText_MoveRelearnerAccuracy[];
+extern const u8 gText_MoveRelearnerContestMovesTitle[];
+extern const u8 gText_MoveRelearnerAppeal[];
+extern const u8 gText_MoveRelearnerJam[];
 
 extern const u8 gText_Kira[];
 extern const u8 gText_Amy[];