summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/learn_move.h4
-rw-r--r--include/list_menu.h2
-rw-r--r--include/menu.h4
-rwxr-xr-xinclude/pokemon_summary_screen.h1
-rw-r--r--include/pokenav.h5
-rw-r--r--include/strings.h10
6 files changed, 21 insertions, 5 deletions
diff --git a/include/learn_move.h b/include/learn_move.h
index 034d689d4..9a7a779df 100644
--- a/include/learn_move.h
+++ b/include/learn_move.h
@@ -1,7 +1,7 @@
#ifndef GUARD_LEARN_MOVE_H
#define GUARD_LEARN_MOVE_H
-void sub_8160624(void);
-void sub_8160638(void);
+void VBlankCB_LearnMove(void);
+void TeachMoveTutorMove(void);
#endif //GUARD_LEARN_MOVE_H
diff --git a/include/list_menu.h b/include/list_menu.h
index d38980213..ee3d60f3d 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -1,6 +1,8 @@
#ifndef GUARD_LIST_MENU_H
#define GUARD_LIST_MENU_H
+#include "window.h"
+
#define LIST_NOTHING_CHOSEN -1
#define LIST_B_PRESSED -2
#define LIST_HEADER -3
diff --git a/include/menu.h b/include/menu.h
index 4cc43dd4c..5dfd99c64 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -46,7 +46,7 @@ void PrintMenuTable(u8 windowId, u8 itemCount, const struct MenuAction *strs);
u8 InitMenuInUpperLeftCornerPlaySoundWhenAPressed(u8 windowId, u8 numItems, u8 initialCursorPos);
u8 GetMenuCursorPos(void);
s8 ProcessMenuInput(void);
-s8 ProcessMenuInputNoWrapAround(void);
+s8 Menu_ProcessInputNoWrapAround(void);
void blit_move_info_icon(u8 winId, u8 a2, u16 x, u16 y);
void reset_temp_tile_data_buffers(void);
void *decompress_and_copy_tile_data_to_vram(u8 bgId, const void *src, int size, u16 offset, u8 mode);
@@ -54,7 +54,7 @@ bool8 free_temp_tile_data_buffers_if_possible(void);
struct WindowTemplate CreateWindowTemplate(u8, u8, u8, u8, u8, u8, u16);
void CreateYesNoMenu(const struct WindowTemplate *windowTemplate, u16 borderFirstTileNum, u8 borderPalette, u8 initialCursorPos);
void copy_decompressed_tile_data_to_vram_autofree(u8 bgId, const void *src, int size, u16 offset, u8 mode);
-s8 ProcessMenuInputNoWrap_(void);
+s8 Menu_ProcessInputNoWrap_(void);
s8 ProcessMenuInput_other(void);
void do_scheduled_bg_tilemap_copies_to_vram(void);
void clear_scheduled_bg_copies_to_vram(void);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index adadcea03..75caa9a3a 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -2,5 +2,6 @@
#define GUARD_POKEMON_SUMMARY_SCREEN_H
void sub_81C4F98(u8, void(*)(void));
+void ShowSelectMovePokemonSummaryScreen(void *a, u8 b, u8 c, void *d, u16 e);
#endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/pokenav.h b/include/pokenav.h
index 2bca4db94..1fef8c91b 100644
--- a/include/pokenav.h
+++ b/include/pokenav.h
@@ -22,6 +22,9 @@ void sub_81D1D04(u8);
bool8 sub_81D1C44(u8);
void sub_81D5FB4(u16*);
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);
#endif //GUARD_POKENAV_H
diff --git a/include/strings.h b/include/strings.h
index 528f70f69..f8d108eba 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -762,4 +762,14 @@ 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_TeachWhichMoveToPkmn[];
+extern const u8 gText_GiveUpTeachingNewMove[];
+extern const u8 gText_TeachX[];
+
#endif //GUARD_STRINGS_H