fixing merge conflicts

1 files changed, 18 insertions, 0 deletions

diff --git a/include/constants/battle_setup.h b/include/constants/battle_setup.h
new file mode 100644
index 000000000..329bfa650
--- /dev/null
+++ b/include/constants/battle_setup.h
@@ -0,0 +1,18 @@
+#ifndef GUARD_CONSTANTS_BATTLE_SETUP_H
+#define GUARD_CONSTANTS_BATTLE_SETUP_H
+
+#define TRAINER_BATTLE_SINGLE                           0
+#define TRAINER_BATTLE_CONTINUE_SCRIPT_NO_MUSIC         1
+#define TRAINER_BATTLE_CONTINUE_SCRIPT                  2
+#define TRAINER_BATTLE_SINGLE_NO_INTRO_TEXT             3
+#define TRAINER_BATTLE_DOUBLE                           4
+#define TRAINER_BATTLE_REMATCH                          5
+#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE           6
+#define TRAINER_BATTLE_REMATCH_DOUBLE                   7
+#define TRAINER_BATTLE_CONTINUE_SCRIPT_DOUBLE_NO_MUSIC  8
+#define TRAINER_BATTLE_9                                9
+#define TRAINER_BATTLE_SET_TRAINER_A                    10
+#define TRAINER_BATTLE_SET_TRAINER_B                    11
+#define TRAINER_BATTLE_12                               12
+
+#endif // GUARD_CONSTANTS_BATTLE_SETUP_H