Merge master into ObjEvent rename

include/constants/battle_arena.h

@@ -0,0 +1,20 @@
+#ifndef GUARD_CONSTANTS_BATTLE_ARENA_H
+#define GUARD_CONSTANTS_BATTLE_ARENA_H
+
+#define BATTLE_ARENA_FUNC_INIT              0
+#define BATTLE_ARENA_FUNC_GET_DATA          1
+#define BATTLE_ARENA_FUNC_SET_DATA          2
+#define BATTLE_ARENA_FUNC_SAVE              3
+#define BATTLE_ARENA_FUNC_SET_REWARD        4
+#define BATTLE_ARENA_FUNC_GIVE_REWARD       5
+#define BATTLE_ARENA_FUNC_GET_TRAINER_NAME  6
+
+#define ARENA_DATA_REWARD             0
+#define ARENA_DATA_WIN_STREAK         1
+#define ARENA_DATA_WIN_STREAK_ACTIVE  2
+
+#define ARENA_CATEGORY_MIND  0
+#define ARENA_CATEGORY_SKILL 1
+#define ARENA_CATEGORY_BODY  2
+
+#endif //GUARD_CONSTANTS_BATTLE_ARENA_H

include/constants/battle_palace.h

@@ -0,0 +1,15 @@
+#ifndef GUARD_CONSTANTS_BATTLE_PALACE_H
+#define GUARD_CONSTANTS_BATTLE_PALACE_H
+
+#define BATTLE_PALACE_FUNC_0   0
+#define BATTLE_PALACE_FUNC_1  1
+#define BATTLE_PALACE_FUNC_2  2
+#define BATTLE_PALACE_FUNC_3  3
+#define BATTLE_PALACE_FUNC_4  4
+#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO  5
+#define BATTLE_PALACE_FUNC_6  6
+#define BATTLE_PALACE_FUNC_7  7
+#define BATTLE_PALACE_FUNC_8  8
+#define BATTLE_PALACE_FUNC_9  9
+
+#endif //GUARD_CONSTANTS_BATTLE_PALACE_H