Merge branch 'master' into document-eventscripts

include/constants/battle_frontier.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H
 #define GUARD_CONSTANTS_BATTLE_FRONTIER_H
 
+#define FRONTIER_CHALLENGE(facility, mode) ((facility << 8) + mode)
+
 // Battle Frontier facility ids.
 #define FRONTIER_FACILITY_TOWER 0
 #define FRONTIER_FACILITY_DOME 1
@@ -41,6 +43,36 @@
 #define SPECIAL_BATTLE_PIKE_DOUBLE 9
 #define SPECIAL_BATTLE_PYRAMID 10
 
+#define MAX_BATTLE_FRONTIER_POINTS 9999
+
+// Frontier Maniac
+#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES       0
+#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES       1
+#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS        2
+#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS   3
+#define FRONTIER_MANIAC_BATTLE_DOME                4
+#define FRONTIER_MANIAC_BATTLE_FACTORY             5
+#define FRONTIER_MANIAC_BATTLE_PALACE              6
+#define FRONTIER_MANIAC_BATTLE_ARENA               7
+#define FRONTIER_MANIAC_BATTLE_PIKE                8
+#define FRONTIER_MANIAC_BATTLE_PYRAMID             9
+#define FRONTIER_MANIAC_FACILITY_COUNT            10
+
+#define FRONTIER_MANIAC_MESSAGE_COUNT 3
+
+// Frontier Gambler
+#define FRONTIER_GAMBLER_WAITING     0
+#define FRONTIER_GAMBLER_PLACED_BET  1
+#define FRONTIER_GAMBLER_WON         2
+#define FRONTIER_GAMBLER_LOST        3
+
+#define FRONTIER_GAMBLER_BET_5      0
+#define FRONTIER_GAMBLER_BET_10     1
+#define FRONTIER_GAMBLER_BET_15     2
+#define FRONTIER_GAMBLER_BET_CANCEL 3
+
+#define FRONTIER_GAMBLER_CHALLENGE_COUNT 12
+
 // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special.
 #define RESULTS_LINK_CONTEST 7
 

include/constants/field_specials.h

@@ -0,0 +1,52 @@
+#ifndef GUARD_CONSTANTS_FIELD_SPECIALS_H
+#define GUARD_CONSTANTS_FIELD_SPECIALS_H
+
+// PC Locations
+#define PC_LOCATION_OTHER           0
+#define PC_LOCATION_BRENDANS_HOUSE  1
+#define PC_LOCATION_MAYS_HOUSE      2
+
+// SS Tidal Locations
+#define SS_TIDAL_LOCATION_OTHER     0
+#define SS_TIDAL_LOCATION_SLATEPORT 1
+#define SS_TIDAL_LOCATION_LILYCOVE  2
+#define SS_TIDAL_LOCATION_ROUTE124  3
+#define SS_TIDAL_LOCATION_ROUTE131  4
+
+// Scrollable Multichoice Menus
+#define SCROLL_MULTI_NONE                                  0
+#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR                 1
+#define SCROLL_MULTI_POKEMON_FAN_CLUB_RATER                2
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1     3
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2     4
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR     5
+#define SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR   6
+#define SCROLL_MULTI_BERRY_POWDER_VENDOR                   7
+#define SCROLL_MULTI_BF_RECEPTIONIST                       8
+#define SCROLL_MULTI_BF_MOVE_TUTOR_1                       9
+#define SCROLL_MULTI_BF_MOVE_TUTOR_2                      10
+#define SCROLL_MULTI_SS_TIDAL_DESTINATION                 11
+#define SCROLL_MULTI_BATTLE_TENT_RULES                    12
+
+#define MAX_SCROLL_MULTI_ON_SCREEN 6
+#define MAX_SCROLL_MULTI_LENGTH 16
+
+// Dept Store Floor Numbers
+#define DEPT_STORE_FLOORNUM_B4F       0
+#define DEPT_STORE_FLOORNUM_B3F       1
+#define DEPT_STORE_FLOORNUM_B2F       2
+#define DEPT_STORE_FLOORNUM_B1F       3
+#define DEPT_STORE_FLOORNUM_1F        4
+#define DEPT_STORE_FLOORNUM_2F        5
+#define DEPT_STORE_FLOORNUM_3F        6
+#define DEPT_STORE_FLOORNUM_4F        7
+#define DEPT_STORE_FLOORNUM_5F        8
+#define DEPT_STORE_FLOORNUM_6F        9
+#define DEPT_STORE_FLOORNUM_7F       10
+#define DEPT_STORE_FLOORNUM_8F       11
+#define DEPT_STORE_FLOORNUM_9F       12
+#define DEPT_STORE_FLOORNUM_10F      13
+#define DEPT_STORE_FLOORNUM_11F      14
+#define DEPT_STORE_FLOORNUM_ROOFTOP  15
+
+#endif // GUARD_CONSTANTS_FIELD_SPECIALS_H

include/constants/flags.h

@@ -1400,7 +1400,7 @@
 #define FLAG_ENABLE_SHIP_BIRTH_ISLAND               (SYSTEM_FLAGS + 0x75)
 #define FLAG_ENABLE_SHIP_FARAWAY_ISLAND             (SYSTEM_FLAGS + 0x76)
 
-#define FLAG_SYS_STORAGE_UNKNOWN_FLAG               (SYSTEM_FLAGS + 0x77)
+#define FLAG_SHOWN_BOX_WAS_FULL_MESSAGE             (SYSTEM_FLAGS + 0x77)
 
 #define FLAG_ARRIVED_ON_FARAWAY_ISLAND              (SYSTEM_FLAGS + 0x78)
 #define FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT     (SYSTEM_FLAGS + 0x79)

include/constants/vars.h

@@ -61,14 +61,14 @@
 #define VAR_0x402E                           0x402E
 
 #define VAR_FRONTIER_MANIAC_FACILITY         0x402F
-#define VAR_FRONTIER_GAMBLER_FACILITY        0x4030
-#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F  0x4031
+#define VAR_FRONTIER_GAMBLER_CHALLENGE       0x4030
+#define VAR_FRONTIER_GAMBLER_SET_CHALLENGE   0x4031
 #define VAR_FRONTIER_GAMBLER_AMOUNT_BET      0x4032
-#define VAR_FRONTIER_GAMBLER_PLACED_BET_F    0x4033
+#define VAR_FRONTIER_GAMBLER_STATE           0x4033
 
 #define VAR_DEOXYS_ROCK_STEP_COUNT           0x4034
 #define VAR_DEOXYS_ROCK_LEVEL                0x4035
-#define VAR_STORAGE_UNKNOWN                  0x4036
+#define VAR_PC_BOX_TO_SEND_MON               0x4036
 #define VAR_UNUSUAL_WEATHER_LOCATION         0x4037
 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER     0x4038
 #define VAR_SHOULD_END_UNUSUAL_WEATHER       0x4039