Merge branch 'master' into document-eventscripts

2019-09-17 18:01:20 -04:00
parent 945d3d3a27 459fca289c
commit 58b8d7c297
49 changed files with 1225 additions and 982 deletions
--- a/include/constants/battle_frontier.h
+++ b/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

--- a/include/constants/field_specials.h
+++ b/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
--- a/include/constants/flags.h
+++ b/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)
--- a/include/constants/vars.h
+++ b/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
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -5,8 +5,8 @@ extern bool8 gBikeCyclingChallenge;
 extern u8 gBikeCollisions;

 u8 GetLeadMonIndex(void);
-u8 sub_813B260(void);
-u16 get_unknown_box_id(void);
+u8 IsDestinationBoxFull(void);
+u16 GetPCBoxToSendMon(void);
 bool8 InMultiBattleRoom(void);
 void sub_813BF10(void);
 void IncrementBirthIslandRockStepCount(void);
@@ -19,17 +19,17 @@ bool32 ShouldDoRoxanneCall(void);
 bool32 ShouldDoRivalRayquazaCall(void);
 bool32 CountSSTidalStep(u16 delta);
 u8 GetSSTidalLocation(s8 *mapGroup, s8 *mapNum, s16 *x, s16 *y);
-void sub_813A128(void);
-void sub_813A878(u8 a0);
+void ShowScrollableMultichoice(void);
+void FrontierGamblerSetWonOrLost(bool8 won);
 u8 sub_813BADC(u8 a0);
-bool8 sub_813B9C0(void);
-void SetShoalItemFlag(u16 v0);
-void UpdateFrontierManiac(u16 a0);
-void UpdateFrontierGambler(u16 a0);
+bool8 InPokemonCenter(void);
+void SetShoalItemFlag(u16 unused);
+void UpdateFrontierManiac(u16 daysSince);
+void UpdateFrontierGambler(u16 daysSince);
 void ResetCyclingRoadChallengeData(void);
-bool8 warp0_in_pokecenter(void);
+bool8 UsedPokemonCenterWarp(void);
 void ResetFanClub(void);
-bool8 sub_813B21C(void);
-void set_unknown_box_id(u8 id);
+bool8 ShouldShowBoxWasFullMessage(void);
+void SetPCBoxToSendMon(u8 boxId);

 #endif // GUARD_FIELD_SPECIALS_H
--- a/include/global.tv.h
+++ b/include/global.tv.h
@@ -4,8 +4,7 @@
 enum
 {
    TVSHOW_OFF_AIR,
-
-    TVSHOW_FAN_CLUB_LETTER = 1,
+    TVSHOW_FAN_CLUB_LETTER,
    TVSHOW_RECENT_HAPPENINGS,
    TVSHOW_PKMN_FAN_CLUB_OPINIONS,
    TVSHOW_UNKN_SHOWTYPE_04,
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -26,6 +26,41 @@ enum
    PARTY_GIVE_ITEM,
 };

+enum
+{
+    TUTOR_MOVE_MEGA_PUNCH,
+    TUTOR_MOVE_SWORDS_DANCE,
+    TUTOR_MOVE_MEGA_KICK,
+    TUTOR_MOVE_BODY_SLAM,
+    TUTOR_MOVE_DOUBLE_EDGE,
+    TUTOR_MOVE_COUNTER,
+    TUTOR_MOVE_SEISMIC_TOSS,
+    TUTOR_MOVE_MIMIC,
+    TUTOR_MOVE_METRONOME,
+    TUTOR_MOVE_SOFT_BOILED,
+    TUTOR_MOVE_DREAM_EATER,
+    TUTOR_MOVE_THUNDER_WAVE,
+    TUTOR_MOVE_EXPLOSION,
+    TUTOR_MOVE_ROCK_SLIDE,
+    TUTOR_MOVE_SUBSTITUTE,
+    TUTOR_MOVE_DYNAMIC_PUNCH,
+    TUTOR_MOVE_ROLLOUT,
+    TUTOR_MOVE_PSYCH_UP,
+    TUTOR_MOVE_SNORE,
+    TUTOR_MOVE_ICY_WIND,
+    TUTOR_MOVE_ENDURE,
+    TUTOR_MOVE_MUD_SLAP,
+    TUTOR_MOVE_ICE_PUNCH,
+    TUTOR_MOVE_SWAGGER,
+    TUTOR_MOVE_SLEEP_TALK,
+    TUTOR_MOVE_SWIFT,
+    TUTOR_MOVE_DEFENSE_CURL,
+    TUTOR_MOVE_THUNDER_PUNCH,
+    TUTOR_MOVE_FIRE_PUNCH,
+    TUTOR_MOVE_FURY_CUTTER,
+    TUTOR_MOVE_COUNT
+};
+
 struct Struct203CEC8
 {
    MainCallback exitCallback;
--- 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)
--- a/include/strings.h
+++ b/include/strings.h
@@ -758,31 +758,29 @@ extern const u8 BattleFrontier_Lounge2_Text_26174D[];
 extern const u8 BattleFrontier_Lounge2_Text_2617F9[];
 extern const u8 BattleFrontier_Lounge2_Text_2618C4[];

-extern const u8 BattleFrontier_Lounge5_Text_26468D[];
-extern const u8 BattleFrontier_Lounge5_Text_2646E5[];
-extern const u8 BattleFrontier_Lounge5_Text_264741[];
-extern const u8 BattleFrontier_Lounge5_Text_2647A4[];
-extern const u8 BattleFrontier_Lounge5_Text_2647FC[];
-extern const u8 BattleFrontier_Lounge5_Text_264858[];
-extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
-extern const u8 BattleFrontier_Lounge5_Text_264916[];
-extern const u8 BattleFrontier_Lounge5_Text_264972[];
-extern const u8 BattleFrontier_Lounge5_Text_2649D5[];
-extern const u8 BattleFrontier_Lounge5_Text_264A3F[];
-extern const u8 BattleFrontier_Lounge5_Text_264A9B[];
-extern const u8 BattleFrontier_Lounge5_Text_264AF3[];
-extern const u8 BattleFrontier_Lounge5_Text_264B5D[];
-extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
-extern const u8 BattleFrontier_Lounge5_Text_264BC3[];
-extern const u8 BattleFrontier_Lounge5_Text_264C36[];
-extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
-extern const u8 BattleFrontier_Lounge5_Text_264C95[];
-extern const u8 BattleFrontier_Lounge5_Text_264D01[];
-extern const u8 BattleFrontier_Lounge5_Text_264D6B[];
-extern const u8 BattleFrontier_Lounge5_Text_264DD7[];
-extern const u8 BattleFrontier_Lounge5_Text_264E33[];
-extern const u8 BattleFrontier_Lounge5_Text_264E8F[];
-extern const u8 BattleFrontier_Lounge5_Text_2648BE[];
+// Battle Frontier Nature Girl
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHardy[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlLonely[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBrave[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlAdamant[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlNaughty[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBold[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlDocileNaiveQuietQuirky[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlRelaxed[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlImpish[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlLax[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlTimid[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlHasty[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSerious[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlJolly[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlModest[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlMild[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlBashful[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlRash[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCalm[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlGentle[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlSassy[];
+extern const u8 BattleFrontier_Lounge5_Text_NatureGirlCareful[];

 extern const u8 BattleFrontier_Lounge3_Text_262261[];
 extern const u8 BattleFrontier_Lounge3_Text_26230D[];