Merge branch 'master' into fix-eventobj

8 files changed, 211 insertions, 65 deletions

diff --git a/include/constants/battle_arena.h b/include/constants/battle_arena.h
index f91a6f674..e04211115 100644
--- a/include/constants/battle_arena.h
+++ b/include/constants/battle_arena.h
@@ -5,11 +5,11 @@
 #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_SET_PRIZE         4
+#define BATTLE_ARENA_FUNC_GIVE_PRIZE        5
 #define BATTLE_ARENA_FUNC_GET_TRAINER_NAME  6
 
-#define ARENA_DATA_REWARD             0
+#define ARENA_DATA_PRIZE              0
 #define ARENA_DATA_WIN_STREAK         1
 #define ARENA_DATA_WIN_STREAK_ACTIVE  2
 
diff --git a/include/constants/battle_dome.h b/include/constants/battle_dome.h
new file mode 100644
index 000000000..48152cdbb
--- /dev/null
+++ b/include/constants/battle_dome.h
@@ -0,0 +1,45 @@
+#ifndef GUARD_CONSTANTS_BATTLE_DOME_H
+#define GUARD_CONSTANTS_BATTLE_DOME_H
+
+#define BATTLE_DOME_FUNC_INIT                       0
+#define BATTLE_DOME_FUNC_GET_DATA                   1
+#define BATTLE_DOME_FUNC_SET_DATA                   2
+#define BATTLE_DOME_FUNC_GET_ROUND_TEXT             3
+#define BATTLE_DOME_FUNC_GET_OPPONENT_NAME          4
+#define BATTLE_DOME_FUNC_INIT_OPPONENT_PARTY        5
+#define BATTLE_DOME_FUNC_SHOW_OPPONENT_INFO         6
+#define BATTLE_DOME_FUNC_SHOW_TOURNEY_TREE          7
+#define BATTLE_DOME_FUNC_SHOW_PREV_RESULTS_TREE     8
+#define BATTLE_DOME_FUNC_SET_OPPONENT_ID            9
+#define BATTLE_DOME_FUNC_SET_OPPONENT_GFX           10
+#define BATTLE_DOME_FUNC_SHOW_STATIC_TOURNEY_TREE   11
+#define BATTLE_DOME_FUNC_RESOLVE_WINNERS            12
+#define BATTLE_DOME_FUNC_SAVE                       13
+#define BATTLE_DOME_FUNC_INCREMENT_STREAK           14
+#define BATTLE_DOME_FUNC_SET_TRAINERS               15
+#define BATTLE_DOME_FUNC_RESET_SKETCH               16
+#define BATTLE_DOME_FUNC_RESTORE_HELD_ITEMS         17
+#define BATTLE_DOME_FUNC_REDUCE_PARTY               18
+#define BATTLE_DOME_FUNC_COMPARE_SEEDS              19
+#define BATTLE_DOME_FUNC_GET_WINNER_NAME            20
+#define BATTLE_DOME_FUNC_21                         21
+#define BATTLE_DOME_FUNC_INIT_TRAINERS              22
+
+#define DOME_DATA_WIN_STREAK 0
+#define DOME_DATA_WIN_STREAK_ACTIVE 1
+#define DOME_DATA_2 2
+#define DOME_DATA_3 3
+#define DOME_DATA_4 4
+#define DOME_DATA_5 5
+#define DOME_DATA_6 6
+#define DOME_DATA_7 7
+#define DOME_DATA_8 8
+#define DOME_DATA_9 9
+
+#define DOME_ROUND1       0
+#define DOME_ROUND2       1
+#define DOME_SEMIFINAL    2
+#define DOME_FINAL        3
+#define DOME_ROUNDS_COUNT 4
+
+#endif //GUARD_CONSTANTS_BATTLE_DOME_H
diff --git a/include/constants/battle_factory.h b/include/constants/battle_factory.h
new file mode 100644
index 000000000..b3aa57449
--- /dev/null
+++ b/include/constants/battle_factory.h
@@ -0,0 +1,37 @@
+#ifndef GUARD_CONSTANTS_BATTLE_FACTORY_H
+#define GUARD_CONSTANTS_BATTLE_FACTORY_H
+
+#define FACTORY_STYLE_NONE           0
+#define FACTORY_STYLE_PREPARATION    1
+#define FACTORY_STYLE_SLOW_STEADY    2
+#define FACTORY_STYLE_ENDURANCE      3
+#define FACTORY_STYLE_HIGH_RISK      4
+#define FACTORY_STYLE_WEAKENING      5
+#define FACTORY_STYLE_UNPREDICTABLE  6
+#define FACTORY_STYLE_WEATHER        7
+#define FACTORY_NUM_STYLES           8
+
+
+#define BATTLE_FACTORY_FUNC_INIT                    0
+#define BATTLE_FACTORY_FUNC_GET_DATA                1
+#define BATTLE_FACTORY_FUNC_SET_DATA                2
+#define BATTLE_FACTORY_FUNC_SAVE                    3
+#define BATTLE_FACTORY_FUNC_NULL                    4
+#define BATTLE_FACTORY_FUNC_NULL2                   5
+#define BATTLE_FACTORY_FUNC_SELECT_RENT_MONS        6
+#define BATTLE_FACTORY_FUNC_SWAP_RENT_MONS          7
+#define BATTLE_FACTORY_FUNC_SET_SWAPPED             8
+#define BATTLE_FACTORY_FUNC_SET_OPPONENT_MONS       9
+#define BATTLE_FACTORY_FUNC_SET_PARTIES             10
+#define BATTLE_FACTORY_FUNC_SET_OPPONENT_GFX        11
+#define BATTLE_FACTORY_FUNC_GENERATE_OPPONENT_MONS  12
+#define BATTLE_FACTORY_FUNC_GENERATE_RENTAL_MONS    13
+#define BATTLE_FACTORY_FUNC_GET_OPPONENT_MON_TYPE   14
+#define BATTLE_FACTORY_FUNC_GET_OPPONENT_STYLE      15
+#define BATTLE_FACTORY_FUNC_RESET_HELD_ITEMS        16
+
+#define FACTORY_DATA_WIN_STREAK         1
+#define FACTORY_DATA_WIN_STREAK_ACTIVE  2
+#define FACTORY_DATA_WIN_STREAK_SWAPS   3
+
+#endif // GUARD_CONSTANTS_BATTLE_FACTORY_H
diff --git a/include/constants/battle_palace.h b/include/constants/battle_palace.h
index 027adf7c8..db9855101 100644
--- a/include/constants/battle_palace.h
+++ b/include/constants/battle_palace.h
@@ -1,15 +1,19 @@
 #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
+#define BATTLE_PALACE_FUNC_INIT                 0
+#define BATTLE_PALACE_FUNC_GET_DATA             1
+#define BATTLE_PALACE_FUNC_SET_DATA             2
+#define BATTLE_PALACE_FUNC_GET_COMMENT_ID       3
+#define BATTLE_PALACE_FUNC_SET_OPPONENT         4
+#define BATTLE_PALACE_FUNC_GET_OPPONENT_INTRO   5
+#define BATTLE_PALACE_FUNC_INCREMENT_STREAK     6
+#define BATTLE_PALACE_FUNC_SAVE                 7
+#define BATTLE_PALACE_FUNC_SET_PRIZE            8
+#define BATTLE_PALACE_FUNC_GIVE_PRIZE           9
+
+#define PALACE_DATA_PRIZE               0
+#define PALACE_DATA_WIN_STREAK          1
+#define PALACE_DATA_WIN_STREAK_ACTIVE   2
 
 #endif //GUARD_CONSTANTS_BATTLE_PALACE_H
diff --git a/include/constants/battle_pike.h b/include/constants/battle_pike.h
index 4fb20550e..c25f76aaa 100644
--- a/include/constants/battle_pike.h
+++ b/include/constants/battle_pike.h
@@ -23,38 +23,50 @@
 #define PIKE_HINT_BRAIN      4
 
 // For the room with a status effect.
-#define PIKE_STATUS_KIRLIA 0
+#define PIKE_STATUS_KIRLIA   0
 #define PIKE_STATUS_DUSCLOPS 1
 
+#define PIKE_STATUS_FREEZE      0
+#define PIKE_STATUS_BURN        1
+#define PIKE_STATUS_TOXIC       2
+#define PIKE_STATUS_PARALYSIS   3
+#define PIKE_STATUS_SLEEP       4
+
 // Function IDs for sBattlePikeFunctions / CallBattlePikeFunction
-#define BATTLE_PIKE_FUNC_SET_ROOM_TYPE                0
-#define BATTLE_PIKE_FUNC_GET_DATA                     1
-#define BATTLE_PIKE_FUNC_SET_DATA                     2
-#define BATTLE_PIKE_FUNC_IS_FINAL_ROOM                3
-#define BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS             4
-#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE                5
-#define BATTLE_PIKE_FUNC_6                            6
-#define BATTLE_PIKE_FUNC_7                            7
-#define BATTLE_PIKE_FUNC_8                            8
-#define BATTLE_PIKE_FUNC_NULL_9                       9
-#define BATTLE_PIKE_FUNC_NULL_10                      10
-#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS              11
-#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON          12
-#define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS            13
-#define BATTLE_PIKE_FUNC_BUFFER_NPC_MSG               14
-#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE           15
-#define BATTLE_PIKE_FUNC_IS_IN                        16
-#define BATTLE_PIKE_FUNC_SET_HINT_ROOM                17
-#define BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID             18
-#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT           19
-#define BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS            20
-#define BATTLE_PIKE_FUNC_BUFFER_RECORD_MIX_MSG        21
-#define BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE         22
-#define BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN       23
-#define BATTLE_PIKE_FUNC_SET_HEALING_ROOMS_DISABLED   24
-#define BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH         25
-#define BATTLE_PIKE_FUNC_SAVE_MON_HELD_ITEMS          26
-#define BATTLE_PIKE_FUNC_LOAD_MON_HELD_ITEMS          27
-#define BATTLE_PIKE_FUNC_INIT_CHALLENGE               28
+#define BATTLE_PIKE_FUNC_SET_ROOM_TYPE             0
+#define BATTLE_PIKE_FUNC_GET_DATA                  1
+#define BATTLE_PIKE_FUNC_SET_DATA                  2
+#define BATTLE_PIKE_FUNC_IS_FINAL_ROOM             3
+#define BATTLE_PIKE_FUNC_SET_ROOM_OBJECTS          4
+#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE             5
+#define BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM      6
+#define BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM    7
+#define BATTLE_PIKE_FUNC_SAVE                      8
+#define BATTLE_PIKE_FUNC_NULL_9                    9
+#define BATTLE_PIKE_FUNC_NULL_10                   10
+#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS           11
+#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON       12
+#define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS         13
+#define BATTLE_PIKE_FUNC_BUFFER_NPC_MSG            14
+#define BATTLE_PIKE_FUNC_STATUS_SCREEN_FADE        15
+#define BATTLE_PIKE_FUNC_IS_IN                     16
+#define BATTLE_PIKE_FUNC_SET_HINT_ROOM             17
+#define BATTLE_PIKE_FUNC_GET_HINT_ROOM_ID          18
+#define BATTLE_PIKE_FUNC_GET_ROOM_TYPE_HINT        19
+#define BATTLE_PIKE_FUNC_CLEAR_TRAINER_IDS         20
+#define BATTLE_PIKE_FUNC_GET_TRAINER_INTRO         21
+#define BATTLE_PIKE_FUNC_GET_QUEEN_FIGHT_TYPE      22
+#define BATTLE_PIKE_FUNC_HEAL_MONS_BEFORE_QUEEN    23
+#define BATTLE_PIKE_FUNC_SET_HEAL_ROOMS_DISABLED   24
+#define BATTLE_PIKE_FUNC_IS_PARTY_FULL_HEALTH      25
+#define BATTLE_PIKE_FUNC_SAVE_HELD_ITEMS           26
+#define BATTLE_PIKE_FUNC_RESET_HELD_ITEMS          27
+#define BATTLE_PIKE_FUNC_INIT                      28
+
+#define PIKE_DATA_PRIZE             0
+#define PIKE_DATA_WIN_STREAK        1
+#define PIKE_DATA_RECORD_STREAK     2
+#define PIKE_DATA_TOTAL_STREAKS     3
+#define PIKE_DATA_WIN_STREAK_ACTIVE 4
 
 #endif // GUARD_CONSTANTS_BATTLE_PIKE_H
diff --git a/include/constants/battle_pyramid.h b/include/constants/battle_pyramid.h
index 0d59ae94d..cfe6e891e 100644
--- a/include/constants/battle_pyramid.h
+++ b/include/constants/battle_pyramid.h
@@ -27,23 +27,35 @@
 #define OBJ_POSITIONS_NEAR_EXIT             4
 
 // Functions IDs for sBattlePyramidFunctions / CallBattlePyramidFunction
-#define BATTLE_PYRAMID_FUNC_INIT_CHALLENGE      0
+#define BATTLE_PYRAMID_FUNC_INIT                0
 #define BATTLE_PYRAMID_FUNC_GET_DATA            1
 #define BATTLE_PYRAMID_FUNC_SET_DATA            2
-#define BATTLE_PYRAMID_FUNC_3                   3
-#define BATTLE_PYRAMID_FUNC_SET_REWARD          4
-#define BATTLE_PYRAMID_FUNC_GIVE_REWARD         5
+#define BATTLE_PYRAMID_FUNC_SAVE                3
+#define BATTLE_PYRAMID_FUNC_SET_PRIZE           4
+#define BATTLE_PYRAMID_FUNC_GIVE_PRIZE          5 // unused
 #define BATTLE_PYRAMID_FUNC_SEED_FLOOR          6
 #define BATTLE_PYRAMID_FUNC_SET_ITEM            7
 #define BATTLE_PYRAMID_FUNC_HIDE_ITEM           8
 #define BATTLE_PYRAMID_FUNC_INIT_TRAINERS       9
 #define BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT      10
-#define BATTLE_PYRAMID_FUNC_UPDATE_STREAK       11
+#define BATTLE_PYRAMID_FUNC_UPDATE_STREAK       11 // unused
 #define BATTLE_PYRAMID_FUNC_IS_IN               12
 #define BATTLE_PYRAMID_FUNC_UPDATE_LIGHT        13
 #define BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS    14
 #define BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE   15
-#define BATTLE_PYRAMID_FUNC_16                  16
+#define BATTLE_PYRAMID_FUNC_16                  16 // unused
 #define BATTLE_PYRAMID_FUNC_RESTORE_PARTY       17
 
+#define PYRAMID_DATA_PRIZE                   0
+#define PYRAMID_DATA_WIN_STREAK              1
+#define PYRAMID_DATA_WIN_STREAK_ACTIVE       2
+#define PYRAMID_DATA_WIN_STREAK_50           3 // the below streak data are redundant with the above when frontier.lvlMode is correct
+#define PYRAMID_DATA_WIN_STREAK_OPEN         4
+#define PYRAMID_DATA_WIN_STREAK_ACTIVE_50    5
+#define PYRAMID_DATA_WIN_STREAK_ACTIVE_OPEN  6
+#define PYRAMID_DATA_TRAINER_FLAGS           7
+
+#define PYRAMID_LIGHT_SET_RADIUS  0
+#define PYRAMID_LIGHT_INCR_RADIUS 1
+
 #endif // GUARD_CONSTANTS_BATTLE_PYRAMID_H
diff --git a/include/constants/battle_tent.h b/include/constants/battle_tent.h
new file mode 100644
index 000000000..666ada6bd
--- /dev/null
+++ b/include/constants/battle_tent.h
@@ -0,0 +1,32 @@
+#ifndef GUARD_CONSTANTS_BATTLE_TENT_H
+#define GUARD_CONSTANTS_BATTLE_TENT_H
+
+#define VERDANTURF_TENT_FUNC_INIT                0
+#define VERDANTURF_TENT_FUNC_GET_PRIZE           1
+#define VERDANTURF_TENT_FUNC_SET_PRIZE           2
+#define VERDANTURF_TENT_FUNC_SET_OPPONENT_GFX    3
+#define VERDANTURF_TENT_FUNC_GET_OPPONENT_INTRO  4
+#define VERDANTURF_TENT_FUNC_SAVE                5
+#define VERDANTURF_TENT_FUNC_SET_RANDOM_PRIZE    6
+#define VERDANTURF_TENT_FUNC_GIVE_PRIZE          7
+
+#define FALLARBOR_TENT_FUNC_INIT               0
+#define FALLARBOR_TENT_FUNC_GET_PRIZE          1
+#define FALLARBOR_TENT_FUNC_SET_PRIZE          2
+#define FALLARBOR_TENT_FUNC_SAVE               3
+#define FALLARBOR_TENT_FUNC_SET_RANDOM_PRIZE   4
+#define FALLARBOR_TENT_FUNC_GIVE_PRIZE         5
+#define FALLARBOR_TENT_FUNC_GET_OPPONENT_NAME  6
+
+#define SLATEPORT_TENT_FUNC_INIT                    0
+#define SLATEPORT_TENT_FUNC_GET_PRIZE               1
+#define SLATEPORT_TENT_FUNC_SET_PRIZE               2
+#define SLATEPORT_TENT_FUNC_SAVE                    3
+#define SLATEPORT_TENT_FUNC_SET_RANDOM_PRIZE        4
+#define SLATEPORT_TENT_FUNC_GIVE_PRIZE              5
+#define SLATEPORT_TENT_FUNC_SELECT_RENT_MONS        6
+#define SLATEPORT_TENT_FUNC_SWAP_RENT_MONS          7
+#define SLATEPORT_TENT_FUNC_GENERATE_OPPONENT_MONS  8
+#define SLATEPORT_TENT_FUNC_GENERATE_RENTAL_MONS    9
+
+#endif // GUARD_CONSTANTS_BATTLE_TENT_H
diff --git a/include/constants/battle_tower.h b/include/constants/battle_tower.h
index 508656fab..6afd8a949 100644
--- a/include/constants/battle_tower.h
+++ b/include/constants/battle_tower.h
@@ -1,21 +1,25 @@
 #ifndef GUARD_CONSTANTS_BATTLE_TOWER_H
 #define GUARD_CONSTANTS_BATTLE_TOWER_H
 
-#define BATTLE_TOWER_FUNC_0               0
-#define BATTLE_TOWER_FUNC_1               1
-#define BATTLE_TOWER_FUNC_2               2
-#define BATTLE_TOWER_FUNC_CHOOSE_TRAINER  3
-#define BATTLE_TOWER_FUNC_4               4
-#define BATTLE_TOWER_FUNC_GIVE_RIBBONS    5
-#define BATTLE_TOWER_FUNC_SAVE            6
-#define BATTLE_TOWER_FUNC_7               7
-#define BATTLE_TOWER_FUNC_NOP             8
-#define BATTLE_TOWER_FUNC_NOP2            9
-#define BATTLE_TOWER_FUNC_10              10
-#define BATTLE_TOWER_FUNC_11              11
-#define BATTLE_TOWER_FUNC_12              12
-#define BATTLE_TOWER_FUNC_13              13
-#define BATTLE_TOWER_FUNC_14              14
-#define BATTLE_TOWER_FUNC_15              15
+#define BATTLE_TOWER_FUNC_INIT                  0
+#define BATTLE_TOWER_FUNC_GET_DATA              1
+#define BATTLE_TOWER_FUNC_SET_DATA              2
+#define BATTLE_TOWER_FUNC_SET_OPPONENT          3
+#define BATTLE_TOWER_FUNC_SET_BATTLE_WON        4
+#define BATTLE_TOWER_FUNC_GIVE_RIBBONS          5
+#define BATTLE_TOWER_FUNC_SAVE                  6
+#define BATTLE_TOWER_FUNC_GET_OPPONENT_INTRO    7
+#define BATTLE_TOWER_FUNC_NOP                   8
+#define BATTLE_TOWER_FUNC_NOP2                  9
+#define BATTLE_TOWER_FUNC_10                    10
+#define BATTLE_TOWER_FUNC_11                    11
+#define BATTLE_TOWER_FUNC_12                    12
+#define BATTLE_TOWER_FUNC_13                    13
+#define BATTLE_TOWER_FUNC_14                    14
+#define BATTLE_TOWER_FUNC_SET_INTERVIEW_DATA    15
+
+#define TOWER_DATA_WIN_STREAK         1
+#define TOWER_DATA_WIN_STREAK_ACTIVE  2
+#define TOWER_DATA_LVL_MODE           3
 
 #endif //GUARD_CONSTANTS_BATTLE_TOWER_H