Split contest funcs from script_pokemon_util

4 files changed, 14 insertions, 19 deletions

diff --git a/include/contest_util.h b/include/contest_util.h
index d0021153d..76f9ae522 100644
--- a/include/contest_util.h
+++ b/include/contest_util.h
@@ -7,5 +7,8 @@ void StartContest(void);
 void BufferContestantMonSpecies(void);
 void ShowContestResults(void);
 void ContestLinkTransfer(u8);
+void ShowContestWinnerPainting(void);
+u16 GetContestRand(void);
+u8 CountPlayerContestPaintings(void);
 
 #endif // GUARD_CONTEST_UTIL_H
diff --git a/include/script_pokemon_80F8.h b/include/script_pokemon_80F8.h
deleted file mode 100644
index 8dd7ed0c0..000000000
--- a/include/script_pokemon_80F8.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE80F8_H
-#define GUARD_SCRIPTPOKE80F8_H
-
-void ShowContestWinner(void);
-u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
-u8 ScriptGiveEgg(u16);
-void CreateScriptedWildMon(u16, u8, u16);
-void ScriptSetMonMoveSlot(u8, u16, u8);
-
-#endif
diff --git a/include/script_pokemon_util.h b/include/script_pokemon_util.h
new file mode 100644
index 000000000..120c28a63
--- /dev/null
+++ b/include/script_pokemon_util.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_SCRIPT_POKEMON_UTIL
+#define GUARD_SCRIPT_POKEMON_UTIL
+
+u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
+u8 ScriptGiveEgg(u16);
+void CreateScriptedWildMon(u16, u8, u16);
+void ScriptSetMonMoveSlot(u8, u16, u8);
+void ReducePlayerPartyToSelectedMons(void);
+void HealPlayerParty(void);
+
+#endif // GUARD_SCRIPT_POKEMON_UTIL
diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h
deleted file mode 100644
index 7c246b745..000000000
--- a/include/script_pokemon_util_80F87D8.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
-#define GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H
-
-u16 GetContestRand(void);
-void ReducePlayerPartyToSelectedMons(void);
-void HealPlayerParty(void);
-u8 CountPlayerContestPaintings(void);
-
-#endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H