Merge branch 'master' into battle

12 files changed, 52 insertions, 2 deletions

diff --git a/include/berry_fix_program.h b/include/berry_fix_program.h
new file mode 100644
index 000000000..fc0748fd9
--- /dev/null
+++ b/include/berry_fix_program.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_BERRY_FIX_PROGRAM_H
+#define GUARD_BERRY_FIX_PROGRAM_H
+
+void mb_berry_fix_serve(void);
+
+#endif //GUARD_BERRY_FIX_PROGRAM_H
diff --git a/include/clear_save_data_screen.h b/include/clear_save_data_screen.h
new file mode 100644
index 000000000..d5d2665ae
--- /dev/null
+++ b/include/clear_save_data_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_CLEAR_SAVE_DATA_SCREEN_H
+#define GUARD_CLEAR_SAVE_DATA_SCREEN_H
+
+void CB2_SaveClearScreen_Init(void);
+
+#endif //GUARD_CLEAR_SAVE_DATA_SCREEN_H
diff --git a/include/global.h b/include/global.h
index e1f63213a..9a398354d 100644
--- a/include/global.h
+++ b/include/global.h
@@ -17,7 +17,7 @@
 // Get the IDE to stfu
 
 // We define it this way to fool preproc.
-#define INCBIN(x) {0}
+#define INCBIN(...) {0}
 #define INCBIN_U8  INCBIN
 #define INCBIN_U16 INCBIN
 #define INCBIN_U32 INCBIN
diff --git a/include/graphics.h b/include/graphics.h
index e1bbb55ef..d8dd5065c 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -961,6 +961,19 @@ extern const u8 gFile_graphics_items_icon_palettes_sapphire_palette[];
 extern const u8 gFile_graphics_items_icons_return_to_field_arrow_sheet[];
 extern const u8 gFile_graphics_items_icon_palettes_return_to_field_arrow_palette[];
 
+// title_screen
+extern const u16 gGraphics_TitleScreen_PokemonFireRedLogoPals[];
+extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoTiles[];
+extern const u8 gGraphics_TitleScreen_PokemonFireRedLogoMap[];
+extern const u16 gGraphics_TitleScreen_CharizardPals[];
+extern const u8 gGraphics_TitleScreen_CharizardTiles[];
+extern const u8 gGraphics_TitleScreen_CharizardMap[];
+extern u16 gGraphics_TitleScreen_BackgroundPals[]; // If this is const, title_screen.c does not match
+extern const u8 gGraphics_TitleScreen_CopyrightPressStartTiles[];
+extern const u8 gGraphics_TitleScreen_CopyrightPressStartMap[];
+extern const u16 gGraphics_TitleScreen_FirePals[];
+extern const u8 gGraphics_TitleScreen_BlankObjTiles[];
+
 extern const u32 gHealthboxSinglesPlayerGfx[];
 extern const u32 gHealthboxSinglesOpponentGfx[];
 extern const u32 gHealthboxDoublesPlayerGfx[];
diff --git a/include/intro.h b/include/intro.h
new file mode 100644
index 000000000..f01c81a9e
--- /dev/null
+++ b/include/intro.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_INTRO_H
+#define GUARD_INTRO_H
+
+void sub_80EC864(void);
+
+#endif //GUARD_INTRO_H
diff --git a/include/main.h b/include/main.h
index a250475cb..d326909ff 100644
--- a/include/main.h
+++ b/include/main.h
@@ -65,6 +65,8 @@ void ClearPokemonCrySongs(void);
 void RestoreSerialTimer3IntrHandlers(void);
 void SetVBlankCounter1Ptr(u32 *ptr);
 void DisableVBlankCounter1(void);
+void StartTimer1(void);
+void SeedRngAndSetTrainerId(void);
 
 extern const char RomHeaderGameCode[4];
 extern const char RomHeaderSoftwareVersion;
diff --git a/include/main_menu.h b/include/main_menu.h
new file mode 100644
index 000000000..2a0cd81d5
--- /dev/null
+++ b/include/main_menu.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_MAIN_MENU_H
+#define GUARD_MAIN_MENU_H
+
+void sub_800C300(void);
+
+#endif //GUARD_MAIN_MENU_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index d68957e62..7b83c913b 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -31,6 +31,7 @@ void DrawDialogueFrame(u8 windowId, bool8 transfer);
 void DrawStdWindowFrame(u8 windowId, bool8 copyNow);
 void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram);
 void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
+void sub_80F6C14(void);
 void sub_80F771C(bool8 copyToVram);
 void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram);
 void sub_80F7768(u8 windowId, bool8 copyToVram);
diff --git a/include/palette.h b/include/palette.h
index 06b9b1f6f..300236d1e 100644
--- a/include/palette.h
+++ b/include/palette.h
@@ -71,7 +71,11 @@ void BlendPalettes(u32, u8, u16);
 void BlendPalettesUnfaded(u32, u8, u16);
 void sub_80716F8(const u16 *, u16 *, u16, u8);
 void TintPalette_GrayScale(u16 *, u16);
+void TintPalette_GrayScale2(u16 *, u16);
 void TintPalette_SepiaTone(u16 *, u16);
+void sub_80717A8(u32, s8, u8, u8, u16, u8, u8);
+bool32 sub_807185C(u8);
+void sub_8071898(void);
 
 extern struct PaletteFadeControl gPaletteFade;
 
diff --git a/include/quest_log.h b/include/quest_log.h
index 4fb4fe0fa..858ea593a 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -22,6 +22,7 @@ extern const u16 gUnknown_84566A8[];
 
 void sub_8112720(u8);
 void sub_8113550(u16, const u16 *);
+void sub_811539C(void);
 void sub_8115748(u16);
 u8 sub_8112CAC(void);
 bool8 sub_81119D4(void (*func)(void));
diff --git a/include/slot_machine.h b/include/slot_machine.h
index 5c96384fa..37120f66b 100644
--- a/include/slot_machine.h
+++ b/include/slot_machine.h
@@ -3,6 +3,6 @@
 
 #include "global.h"
 
-void PlaySlotMachine(u8, void *);
+void PlaySlotMachine(u16, void (*)(void));
 
 #endif // GUARD_SLOT_MACHINE_H
diff --git a/include/strings.h b/include/strings.h
index 8c97cef13..5197a56f7 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -203,6 +203,11 @@ extern const u8 gString_BattleRecords_ColumnHeaders[];
 extern const u8 gString_BattleRecords_7Dashes[];
 extern const u8 gString_BattleRecords_4Dashes[];
 
+// slot_machine
+extern const u8 gString_OutOfCoins[];
+extern const u8 gString_QuitPlaying[];
+extern const u8 gString_SlotMachineControls[];
+
 // battle_controller_safari
 extern const u8 gUnknown_83FDA4C[];
 extern const u8 gUnknown_83FE747[];