2 files changed, 54 insertions, 57 deletions
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
new file mode 100644
index 000000000..213263b47
--- /dev/null
+++ b/include/constants/party_menu.h
@@ -0,0 +1,52 @@
+#ifndef GUARD_CONSTANTS_PARTY_MENU_H
+#define GUARD_CONSTANTS_PARTY_MENU_H
+
+#define AILMENT_NONE  0
+#define AILMENT_PSN   1
+#define AILMENT_PRZ   2
+#define AILMENT_SLP   3
+#define AILMENT_FRZ   4
+#define AILMENT_BRN   5
+#define AILMENT_PKRS  6
+#define AILMENT_FNT   7
+
+#define PARTY_CHOOSE_MON        0
+#define PARTY_MUST_CHOOSE_MON   1
+#define PARTY_CANT_SWITCH       2
+#define PARTY_USE_ITEM_ON       3
+#define PARTY_ABILITY_PREVENTS  4
+#define PARTY_GIVE_ITEM         5
+
+#define TUTOR_MOVE_MEGA_PUNCH      0
+#define TUTOR_MOVE_SWORDS_DANCE    1
+#define TUTOR_MOVE_MEGA_KICK       2
+#define TUTOR_MOVE_BODY_SLAM       3
+#define TUTOR_MOVE_DOUBLE_EDGE     4
+#define TUTOR_MOVE_COUNTER         5
+#define TUTOR_MOVE_SEISMIC_TOSS    6
+#define TUTOR_MOVE_MIMIC           7
+#define TUTOR_MOVE_METRONOME       8
+#define TUTOR_MOVE_SOFT_BOILED     9
+#define TUTOR_MOVE_DREAM_EATER     10
+#define TUTOR_MOVE_THUNDER_WAVE    11
+#define TUTOR_MOVE_EXPLOSION       12
+#define TUTOR_MOVE_ROCK_SLIDE      13
+#define TUTOR_MOVE_SUBSTITUTE      14
+#define TUTOR_MOVE_DYNAMIC_PUNCH   15
+#define TUTOR_MOVE_ROLLOUT         16
+#define TUTOR_MOVE_PSYCH_UP        17
+#define TUTOR_MOVE_SNORE           18
+#define TUTOR_MOVE_ICY_WIND        19
+#define TUTOR_MOVE_ENDURE          20
+#define TUTOR_MOVE_MUD_SLAP        21
+#define TUTOR_MOVE_ICE_PUNCH       22
+#define TUTOR_MOVE_SWAGGER         23
+#define TUTOR_MOVE_SLEEP_TALK      24
+#define TUTOR_MOVE_SWIFT           25
+#define TUTOR_MOVE_DEFENSE_CURL    26
+#define TUTOR_MOVE_THUNDER_PUNCH   27
+#define TUTOR_MOVE_FIRE_PUNCH      28
+#define TUTOR_MOVE_FURY_CUTTER     29
+#define TUTOR_MOVE_COUNT           30
+
+#endif // GUARD_CONSTANTS_PARTY_MENU_H
diff --git a/include/party_menu.h b/include/party_menu.h
index d76e50788..84b6c1ad8 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,7 @@ 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 sub_81B8958(void);
 void OpenPartyMenuInBattle(u8 arg);
 void sub_81B89F0(void);