Fix merge conflicts

8 files changed, 240 insertions, 4 deletions

diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h
index 55b14b642..ca9e3bc9f 100644
--- a/include/constants/battle_frontier.h
+++ b/include/constants/battle_frontier.h
@@ -9,6 +9,7 @@
 #define FRONTIER_FACILITY_FACTORY 4
 #define FRONTIER_FACILITY_PIKE 5
 #define FRONTIER_FACILITY_PYRAMID 6
+#define NUM_FRONTIER_FACILITIES 7
 
 #define TENT_VERDANTURF 2
 #define TENT_FALLARBOR 3
diff --git a/include/gba/types.h b/include/gba/types.h
index fff48d437..3d78b5b5e 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -59,8 +59,8 @@ struct OamData
              u32 shape:2;       // 0x40, 0x80 -> 0xC0
 
     /*0x02*/ u32 x:9;
-             u32 matrixNum:5; // bits 3/4 are h-flip/v-flip if not in affine mode
-             u32 size:2;
+             u32 matrixNum:5;   // bits 3/4 are h-flip/v-flip if not in affine mode
+             u32 size:2;        // 0x4000, 0x8000 -> 0xC000
 
     /*0x04*/ u16 tileNum:10;    // 0x3FF
              u16 priority:2;    // 0x400, 0x800 -> 0xC00
diff --git a/include/graphics.h b/include/graphics.h
index ad2b39260..4563a7e99 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -4818,4 +4818,13 @@ extern const u32 gStatusPal_Icons[];
 extern const u32 gPartyMenuPokeball_Pal[];
 extern const u32 gStatusPal_Icons[];
 
+// Roulette
+extern const u32 gRouletteMenuTiles[];
+extern const u32 gRouletteWheelTiles[];
+extern const u32 gRouletteCenter_Gfx[];
+extern const u32 gRouletteHeadersTiles[];
+extern const u32 gRouletteCreditTiles[];
+extern const u32 gRouletteNumbersTiles[];
+extern const u32 gRouletteMultiplierTiles[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/m4a.h b/include/m4a.h
index 595379495..4847c12cc 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -8,7 +8,8 @@ void m4aSoundVSyncOn(void);
 
 void m4aSoundInit(void);
 void m4aSoundMain(void);
-void m4aSongNumStart(u16);
+void m4aSongNumStart(u16 n);
+void m4aSongNumStartOrChange(u16 n);
 void m4aSongNumStop(u16 n);
 void m4aMPlayAllStop(void);
 void m4aMPlayContinue(struct MusicPlayerInfo *mplayInfo);
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index ee8501d18..63af4c731 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -20,7 +20,7 @@ void ResetAllBgsCoordinates(void);
 void SetVBlankHBlankCallbacksToNull(void);
 void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
 bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
-void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
+void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data);
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
 u8 GetLRKeysState(void);
diff --git a/include/roulette_util.h b/include/roulette_util.h
index 7f0b9cbf8..76752fe74 100644
--- a/include/roulette_util.h
+++ b/include/roulette_util.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_ROULETTE_UTIL_H
 #define GUARD_ROULETTE_UTIL_H
 
+#include "roulette.h"
+
 struct PulseBlendSettings
 {
     u16 blendColor;
@@ -41,5 +43,10 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
 void UpdatePulseBlend(struct PulseBlend *);
 void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
 void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
+void task_tutorial_controls_fadein(struct UnkStruct0 *r0);
+void sub_8151678(struct UnkStruct0 *r0);
+u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2);
+void sub_8151A9C(struct UnkStruct0 *r0, u16 r1);
+void sub_8151A48(struct UnkStruct0 *r0, u16 r1);
 
 #endif // GUARD_ROULETTE_UTIL_H
diff --git a/include/rtc.h b/include/rtc.h
index 5ee6a5316..7a3d3d524 100644
--- a/include/rtc.h
+++ b/include/rtc.h
@@ -44,5 +44,6 @@ void RtcInitLocalTimeOffset(s32 hour, s32 minute);
 void RtcCalcLocalTimeOffset(s32 days, s32 hours, s32 minutes, s32 seconds);
 void CalcTimeDifference(struct Time *result, struct Time *t1, struct Time *t2);
 u32 RtcGetMinuteCount(void);
+u32 RtcGetLocalDayCount(void);
 
 #endif // GUARD_RTC_UTIL_H
diff --git a/include/strings.h b/include/strings.h
index b941f7825..c88252b7b 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -869,6 +869,13 @@ extern const u8 gText_TeachWhichMoveToPkmn[];
 extern const u8 gText_GiveUpTeachingNewMove[];
 extern const u8 gText_TeachX[];
 
+extern const u8 gText_Kira[];
+extern const u8 gText_Amy[];
+extern const u8 gText_John[];
+extern const u8 gText_Roy[];
+extern const u8 gText_Gabby[];
+extern const u8 gText_Anna[];
+
 extern const u8 gText_DadsAdvice[];
 extern const u8 gText_CantDismountBike[];
 extern const u8 gText_ItemFinderNothing[];
@@ -1990,4 +1997,214 @@ extern const u8 gText_XSentOverY[];
 extern const u8 gText_TakeGoodCareOfX[];
 extern const u8 gText_CommunicationStandby5[];
 
+// roulette
+extern const u8 gUnknown_082A5B89[];
+
+// match call
+extern const u8 MatchCall_WildBattleText1[];
+extern const u8 MatchCall_WildBattleText2[];
+extern const u8 MatchCall_WildBattleText3[];
+extern const u8 MatchCall_WildBattleText4[];
+extern const u8 MatchCall_WildBattleText5[];
+extern const u8 MatchCall_WildBattleText6[];
+extern const u8 MatchCall_WildBattleText7[];
+extern const u8 MatchCall_WildBattleText8[];
+extern const u8 MatchCall_WildBattleText9[];
+extern const u8 MatchCall_WildBattleText10[];
+extern const u8 MatchCall_WildBattleText11[];
+extern const u8 MatchCall_WildBattleText12[];
+extern const u8 MatchCall_WildBattleText13[];
+extern const u8 MatchCall_WildBattleText14[];
+extern const u8 MatchCall_WildBattleText15[];
+extern const u8 MatchCall_NegativeBattleText1[];
+extern const u8 MatchCall_NegativeBattleText2[];
+extern const u8 MatchCall_NegativeBattleText3[];
+extern const u8 MatchCall_NegativeBattleText4[];
+extern const u8 MatchCall_NegativeBattleText5[];
+extern const u8 MatchCall_NegativeBattleText6[];
+extern const u8 MatchCall_NegativeBattleText7[];
+extern const u8 MatchCall_NegativeBattleText8[];
+extern const u8 MatchCall_NegativeBattleText9[];
+extern const u8 MatchCall_NegativeBattleText10[];
+extern const u8 MatchCall_NegativeBattleText11[];
+extern const u8 MatchCall_NegativeBattleText12[];
+extern const u8 MatchCall_NegativeBattleText13[];
+extern const u8 MatchCall_NegativeBattleText14[];
+extern const u8 MatchCall_PositiveBattleText1[];
+extern const u8 MatchCall_PositiveBattleText2[];
+extern const u8 MatchCall_PositiveBattleText3[];
+extern const u8 MatchCall_PositiveBattleText4[];
+extern const u8 MatchCall_PositiveBattleText5[];
+extern const u8 MatchCall_PositiveBattleText6[];
+extern const u8 MatchCall_PositiveBattleText7[];
+extern const u8 MatchCall_PositiveBattleText8[];
+extern const u8 MatchCall_PositiveBattleText9[];
+extern const u8 MatchCall_PositiveBattleText10[];
+extern const u8 MatchCall_PositiveBattleText11[];
+extern const u8 MatchCall_PositiveBattleText12[];
+extern const u8 MatchCall_PositiveBattleText13[];
+extern const u8 MatchCall_PositiveBattleText14[];
+extern const u8 MatchCall_SameRouteBattleRequestText1[];
+extern const u8 MatchCall_SameRouteBattleRequestText2[];
+extern const u8 MatchCall_SameRouteBattleRequestText3[];
+extern const u8 MatchCall_SameRouteBattleRequestText4[];
+extern const u8 MatchCall_SameRouteBattleRequestText5[];
+extern const u8 MatchCall_SameRouteBattleRequestText6[];
+extern const u8 MatchCall_SameRouteBattleRequestText7[];
+extern const u8 MatchCall_SameRouteBattleRequestText8[];
+extern const u8 MatchCall_SameRouteBattleRequestText9[];
+extern const u8 MatchCall_SameRouteBattleRequestText10[];
+extern const u8 MatchCall_SameRouteBattleRequestText11[];
+extern const u8 MatchCall_SameRouteBattleRequestText12[];
+extern const u8 MatchCall_SameRouteBattleRequestText13[];
+extern const u8 MatchCall_SameRouteBattleRequestText14[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText1[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText2[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText3[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText4[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText5[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText6[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText7[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText8[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText9[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText10[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText11[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText12[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText13[];
+extern const u8 MatchCall_DifferentRouteBattleRequestText14[];
+extern const u8 MatchCall_PersonalizedText1[];
+extern const u8 MatchCall_PersonalizedText2[];
+extern const u8 MatchCall_PersonalizedText3[];
+extern const u8 MatchCall_PersonalizedText4[];
+extern const u8 MatchCall_PersonalizedText5[];
+extern const u8 MatchCall_PersonalizedText6[];
+extern const u8 MatchCall_PersonalizedText7[];
+extern const u8 MatchCall_PersonalizedText8[];
+extern const u8 MatchCall_PersonalizedText9[];
+extern const u8 MatchCall_PersonalizedText10[];
+extern const u8 MatchCall_PersonalizedText11[];
+extern const u8 MatchCall_PersonalizedText12[];
+extern const u8 MatchCall_PersonalizedText13[];
+extern const u8 MatchCall_PersonalizedText14[];
+extern const u8 MatchCall_PersonalizedText15[];
+extern const u8 MatchCall_PersonalizedText16[];
+extern const u8 MatchCall_PersonalizedText17[];
+extern const u8 MatchCall_PersonalizedText18[];
+extern const u8 MatchCall_PersonalizedText19[];
+extern const u8 MatchCall_PersonalizedText20[];
+extern const u8 MatchCall_PersonalizedText21[];
+extern const u8 MatchCall_PersonalizedText22[];
+extern const u8 MatchCall_PersonalizedText23[];
+extern const u8 MatchCall_PersonalizedText24[];
+extern const u8 MatchCall_PersonalizedText25[];
+extern const u8 MatchCall_PersonalizedText26[];
+extern const u8 MatchCall_PersonalizedText27[];
+extern const u8 MatchCall_PersonalizedText28[];
+extern const u8 MatchCall_PersonalizedText29[];
+extern const u8 MatchCall_PersonalizedText30[];
+extern const u8 MatchCall_PersonalizedText31[];
+extern const u8 MatchCall_PersonalizedText32[];
+extern const u8 MatchCall_PersonalizedText33[];
+extern const u8 MatchCall_PersonalizedText34[];
+extern const u8 MatchCall_PersonalizedText35[];
+extern const u8 MatchCall_PersonalizedText36[];
+extern const u8 MatchCall_PersonalizedText37[];
+extern const u8 MatchCall_PersonalizedText38[];
+extern const u8 MatchCall_PersonalizedText39[];
+extern const u8 MatchCall_PersonalizedText40[];
+extern const u8 MatchCall_PersonalizedText41[];
+extern const u8 MatchCall_PersonalizedText42[];
+extern const u8 MatchCall_PersonalizedText43[];
+extern const u8 MatchCall_PersonalizedText44[];
+extern const u8 MatchCall_PersonalizedText45[];
+extern const u8 MatchCall_PersonalizedText46[];
+extern const u8 MatchCall_PersonalizedText47[];
+extern const u8 MatchCall_PersonalizedText48[];
+extern const u8 MatchCall_PersonalizedText49[];
+extern const u8 MatchCall_PersonalizedText50[];
+extern const u8 MatchCall_PersonalizedText51[];
+extern const u8 MatchCall_PersonalizedText52[];
+extern const u8 MatchCall_PersonalizedText53[];
+extern const u8 MatchCall_PersonalizedText54[];
+extern const u8 MatchCall_PersonalizedText55[];
+extern const u8 MatchCall_PersonalizedText56[];
+extern const u8 MatchCall_PersonalizedText57[];
+extern const u8 MatchCall_PersonalizedText58[];
+extern const u8 MatchCall_PersonalizedText59[];
+extern const u8 MatchCall_PersonalizedText60[];
+extern const u8 MatchCall_PersonalizedText61[];
+extern const u8 MatchCall_PersonalizedText62[];
+extern const u8 MatchCall_PersonalizedText63[];
+extern const u8 MatchCall_PersonalizedText64[];
+extern const u8 MatchCall_BattleFrontierStreakText1[];
+extern const u8 MatchCall_BattleFrontierStreakText2[];
+extern const u8 MatchCall_BattleFrontierStreakText3[];
+extern const u8 MatchCall_BattleFrontierStreakText4[];
+extern const u8 MatchCall_BattleFrontierStreakText5[];
+extern const u8 MatchCall_BattleFrontierStreakText6[];
+extern const u8 MatchCall_BattleFrontierStreakText7[];
+extern const u8 MatchCall_BattleFrontierStreakText8[];
+extern const u8 MatchCall_BattleFrontierStreakText9[];
+extern const u8 MatchCall_BattleFrontierStreakText10[];
+extern const u8 MatchCall_BattleFrontierStreakText11[];
+extern const u8 MatchCall_BattleFrontierStreakText12[];
+extern const u8 MatchCall_BattleFrontierStreakText13[];
+extern const u8 MatchCall_BattleFrontierStreakText14[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText1[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText2[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText3[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText4[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText5[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText6[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText7[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText8[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText9[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText10[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText11[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText12[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText13[];
+extern const u8 MatchCall_BattleFrontierRecordStreakText14[];
+extern const u8 MatchCall_BattleDomeText1[];
+extern const u8 MatchCall_BattleDomeText2[];
+extern const u8 MatchCall_BattleDomeText3[];
+extern const u8 MatchCall_BattleDomeText4[];
+extern const u8 MatchCall_BattleDomeText5[];
+extern const u8 MatchCall_BattleDomeText6[];
+extern const u8 MatchCall_BattleDomeText7[];
+extern const u8 MatchCall_BattleDomeText8[];
+extern const u8 MatchCall_BattleDomeText9[];
+extern const u8 MatchCall_BattleDomeText10[];
+extern const u8 MatchCall_BattleDomeText11[];
+extern const u8 MatchCall_BattleDomeText12[];
+extern const u8 MatchCall_BattleDomeText13[];
+extern const u8 MatchCall_BattleDomeText14[];
+extern const u8 MatchCall_BattlePikeText1[];
+extern const u8 MatchCall_BattlePikeText2[];
+extern const u8 MatchCall_BattlePikeText3[];
+extern const u8 MatchCall_BattlePikeText4[];
+extern const u8 MatchCall_BattlePikeText5[];
+extern const u8 MatchCall_BattlePikeText6[];
+extern const u8 MatchCall_BattlePikeText7[];
+extern const u8 MatchCall_BattlePikeText8[];
+extern const u8 MatchCall_BattlePikeText9[];
+extern const u8 MatchCall_BattlePikeText10[];
+extern const u8 MatchCall_BattlePikeText11[];
+extern const u8 MatchCall_BattlePikeText12[];
+extern const u8 MatchCall_BattlePikeText13[];
+extern const u8 MatchCall_BattlePikeText14[];
+extern const u8 MatchCall_BattlePyramidText1[];
+extern const u8 MatchCall_BattlePyramidText2[];
+extern const u8 MatchCall_BattlePyramidText3[];
+extern const u8 MatchCall_BattlePyramidText4[];
+extern const u8 MatchCall_BattlePyramidText5[];
+extern const u8 MatchCall_BattlePyramidText6[];
+extern const u8 MatchCall_BattlePyramidText7[];
+extern const u8 MatchCall_BattlePyramidText8[];
+extern const u8 MatchCall_BattlePyramidText9[];
+extern const u8 MatchCall_BattlePyramidText10[];
+extern const u8 MatchCall_BattlePyramidText11[];
+extern const u8 MatchCall_BattlePyramidText12[];
+extern const u8 MatchCall_BattlePyramidText13[];
+extern const u8 MatchCall_BattlePyramidText14[];
+
 #endif //GUARD_STRINGS_H