Merge branch 'master' into patch-2

1 files changed, 3 insertions, 57 deletions

diff --git a/include/party_menu.h b/include/party_menu.h
index cfd8840a7..a26cdb4cd 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -4,62 +4,7 @@
 #include "main.h"
 #include "task.h"
 
-enum
-{
-    AILMENT_NONE,
-    AILMENT_PSN,
-    AILMENT_PRZ,
-    AILMENT_SLP,
-    AILMENT_FRZ,
-    AILMENT_BRN,
-    AILMENT_PKRS,
-    AILMENT_FNT
-};
-
-enum
-{
-    PARTY_CHOOSE_MON,
-    PARTY_MUST_CHOOSE_MON,
-    PARTY_CANT_SWITCH,
-    PARTY_USE_ITEM_ON,
-    PARTY_ABILITY_PREVENTS,
-    PARTY_GIVE_ITEM,
-};
-
-enum
-{
-    TUTOR_MOVE_MEGA_PUNCH,
-    TUTOR_MOVE_SWORDS_DANCE,
-    TUTOR_MOVE_MEGA_KICK,
-    TUTOR_MOVE_BODY_SLAM,
-    TUTOR_MOVE_DOUBLE_EDGE,
-    TUTOR_MOVE_COUNTER,
-    TUTOR_MOVE_SEISMIC_TOSS,
-    TUTOR_MOVE_MIMIC,
-    TUTOR_MOVE_METRONOME,
-    TUTOR_MOVE_SOFT_BOILED,
-    TUTOR_MOVE_DREAM_EATER,
-    TUTOR_MOVE_THUNDER_WAVE,
-    TUTOR_MOVE_EXPLOSION,
-    TUTOR_MOVE_ROCK_SLIDE,
-    TUTOR_MOVE_SUBSTITUTE,
-    TUTOR_MOVE_DYNAMIC_PUNCH,
-    TUTOR_MOVE_ROLLOUT,
-    TUTOR_MOVE_PSYCH_UP,
-    TUTOR_MOVE_SNORE,
-    TUTOR_MOVE_ICY_WIND,
-    TUTOR_MOVE_ENDURE,
-    TUTOR_MOVE_MUD_SLAP,
-    TUTOR_MOVE_ICE_PUNCH,
-    TUTOR_MOVE_SWAGGER,
-    TUTOR_MOVE_SLEEP_TALK,
-    TUTOR_MOVE_SWIFT,
-    TUTOR_MOVE_DEFENSE_CURL,
-    TUTOR_MOVE_THUNDER_PUNCH,
-    TUTOR_MOVE_FIRE_PUNCH,
-    TUTOR_MOVE_FURY_CUTTER,
-    TUTOR_MOVE_COUNT
-};
+#include "constants/party_menu.h"
 
 struct Struct203CEC8
 {
@@ -123,7 +68,8 @@ void sub_81B8448(void);
 void InitChooseHalfPartyForBattle(u8 unused);
 void sub_81B8558(void);
 void sub_81B8904(u8 initArg, MainCallback callback);
-void sub_81B892C(void);
+void OpenPartyMenuForMoveTutor(void);
+void ChooseMonForWirelessMinigame(void);
 void ChooseMonForWirelessMinigame(void);
 void OpenPartyMenuInBattle(u8 arg);
 void sub_81B89F0(void);