diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/battle_frontier.h | 28 | ||||
| -rw-r--r-- | include/constants/field_specials.h | 37 | ||||
| -rw-r--r-- | include/slot_machine.h | 1 |
3 files changed, 37 insertions, 29 deletions
diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 9675615de..d287dd2db 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -45,6 +45,34 @@ #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 diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index e9042dba3..5ec38d1d4 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -6,6 +6,13 @@ #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 @@ -21,6 +28,7 @@ #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 @@ -41,33 +49,4 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 -// 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 - - #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H diff --git a/include/slot_machine.h b/include/slot_machine.h index d441b7411..1b22e165f 100644 --- a/include/slot_machine.h +++ b/include/slot_machine.h @@ -4,6 +4,7 @@ #define NUM_REELS 3 #define REEL_NUM_TAGS 21 #define REEL_TAG_HEIGHT 24 +#define SLOT_MACHINE_COUNT 12 // Lucky Flags #define LUCKY_BIAS_REPLAY (1 << 0) |