Merge branch 'master' of https://github.com/pret/pokeemerald

1 files changed, 5 insertions, 15 deletions

diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 6413dcdec..3996c8e15 100755
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -12,26 +12,16 @@ void ShowPokemonSummaryScreen(u8 mode, void *mons, u8 monIndex, u8 maxMonIndex,
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void), u16 newMove);
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
 u8 GetMoveSlotToReplace(void);
-void SummaryScreen_SetUnknownTaskId(u8 taskId);
-void SummaryScreen_DestroyUnknownTask(void);
+void SummaryScreen_SetAnimDelayTaskId(u8 taskId);
 
 // The Pokemon Summary Screen can operate in different modes. Certain features,
 // such as move re-ordering, are available in the different modes.
 enum PokemonSummaryScreenMode
 {
-    PSS_MODE_NORMAL,
-    PSS_MODE_LOCK_MOVES,
-    PSS_MODE_BOX,
-    PSS_MODE_SELECT_MOVE,
-};
-
-enum PokemonSummaryScreenPage
-{
-    PSS_PAGE_INFO,
-    PSS_PAGE_SKILLS,
-    PSS_PAGE_BATTLE_MOVES,
-    PSS_PAGE_CONTEST_MOVES,
-    PSS_PAGE_COUNT,
+    SUMMARY_MODE_NORMAL,
+    SUMMARY_MODE_LOCK_MOVES,
+    SUMMARY_MODE_BOX,
+    SUMMARY_MODE_SELECT_MOVE,
 };
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H