Merge branch 'master' of github.com:pret/pokefirered into script_pokemon_util

14 files changed, 17 insertions, 23 deletions

diff --git a/include/intro.h b/include/intro.h
index f01c81a9e..19cdcd032 100644
--- a/include/intro.h
+++ b/include/intro.h
@@ -2,5 +2,6 @@
 #define GUARD_INTRO_H
 
 void sub_80EC864(void);
+void c2_copyright_1(void);
 
 #endif //GUARD_INTRO_H
diff --git a/include/librfu.h b/include/librfu.h
index f5a7b4d96..cf409ca69 100644
--- a/include/librfu.h
+++ b/include/librfu.h
@@ -490,7 +490,7 @@ struct RfuStatic
     u32 totalPacketSize;
 };
 
-struct RfuS32Id
+struct RfuSIO32Id
 {
     u8 unk0;
     u8 unk1;
@@ -517,7 +517,7 @@ extern struct RfuStatic *gRfuStatic;
 extern struct RfuFixed *gRfuFixed;
 extern struct RfuSlotStatusNI *gRfuSlotStatusNI[RFU_CHILD_MAX];
 extern struct RfuSlotStatusUNI *gRfuSlotStatusUNI[RFU_CHILD_MAX];
-extern struct RfuS32Id gRfuS32Id;
+extern struct RfuSIO32Id gRfuSIO32Id;
 
 // librfu_s32id
 s32 AgbRFU_checkID(u8);
diff --git a/include/link.h b/include/link.h
index 9465f0404..d61152d8a 100644
--- a/include/link.h
+++ b/include/link.h
@@ -259,5 +259,7 @@ void sub_80FA42C(void);
 void sub_800B284(struct LinkPlayer * linkPlayer);
 bool8 IsWirelessAdapterConnected(void);
 bool8 sub_800A474(u8 a0);
+void LinkVSync(void);
+bool8 HandleLinkConnection(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/link_rfu.h b/include/link_rfu.h
index d1bc2b2bc..033f4c8d4 100644
--- a/include/link_rfu.h
+++ b/include/link_rfu.h
@@ -46,6 +46,8 @@ void sub_80FBB20(void);
 bool8 sub_80FA484(bool32 a0);
 void var_800D_set_xB(void);
 struct UnkLinkRfuStruct_02022B14 *sub_80F9800(void);
+void sub_80FCF34(void);
+void InitRFU(void);
 
 #include "mevent_server.h"
 extern const struct mevent_server_cmd gMEventSrvScript_OtherTrainerCanceled[];
diff --git a/include/load_save.h b/include/load_save.h
index 10d1083a8..20df691e5 100644
--- a/include/load_save.h
+++ b/include/load_save.h
@@ -4,6 +4,8 @@
 #include "global.h"
 
 extern bool32 gFlashMemoryPresent;
+extern struct SaveBlock1 gSaveBlock1;
+extern struct SaveBlock2 gSaveBlock2;
 
 void ClearSav2(void);
 void ClearSav1(void);
diff --git a/include/m4a.h b/include/m4a.h
index 2bb7f2124..ee23d917a 100644
--- a/include/m4a.h
+++ b/include/m4a.h
@@ -9,6 +9,7 @@ extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern struct MusicPlayerInfo gMPlayInfo_SE1;
 extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_SE3;
+extern struct SoundInfo gSoundInfo;
 
 void m4aSoundVSync(void);
 void m4aSoundVSyncOn(void);
diff --git a/include/overworld.h b/include/overworld.h
index 324150779..69c1e964f 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -150,5 +150,7 @@ void sub_8055738(u8 loc);
 
 void sub_8056078(void *, void *);
 void sub_805546C(u8 a0);
+bool32 sub_80582E0(void);
+bool32 sub_8058274(void);
 
 #endif //GUARD_OVERWORLD_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 7bc1239f1..999879880 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -513,6 +513,7 @@ extern const u16 *const gLevelUpLearnsets[];
 extern const u8 gFacilityClassToPicIndex[];
 extern const u8 gFacilityClassToTrainerClass[];
 extern const struct SpriteTemplate gUnknown_825DEF0[];
+extern const u8 gPPUpGetMask[];
 
 void ZeroBoxMonData(struct BoxPokemon *boxMon);
 void ZeroMonData(struct Pokemon *mon);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 3695d46df..2b8f96316 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -34,5 +34,6 @@ enum PokemonSummaryScreenPage
 
 s32 GetLastViewedMonIndex(void);
 void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4);
+void sub_8138B38(u8);
 
 #endif // GUARD_POKEMON_SUMMARY_SCREEN_H
diff --git a/include/save_failed_screen.h b/include/save_failed_screen.h
index feffa2014..5950430d2 100644
--- a/include/save_failed_screen.h
+++ b/include/save_failed_screen.h
@@ -2,5 +2,7 @@
 #define GUARD_SAVE_FAILED_SCREEN_H
 
 extern void DoSaveFailedScreen(u8 saveType); // save_failed_screen
+void sub_80F50F4(void);
+bool32 sub_80F5118(void);
 
 #endif //GUARD_SAVE_FAILED_SCREEN_H
diff --git a/include/script_pokemon_80F8.h b/include/script_pokemon_80F8.h
deleted file mode 100644
index 8a5bb12e1..000000000
--- a/include/script_pokemon_80F8.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE80F8_H
-#define GUARD_SCRIPTPOKE80F8_H
-
-#include "global.h"
-
-void ShowContestWinner(void);
-u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8);
-u8 ScriptGiveEgg(u16);
-void CreateScriptedWildMon(u16, u8, u16);
-void ScriptSetMonMoveSlot(u8, u16, u8);
-
-#endif
diff --git a/include/script_pokemon_81B9.h b/include/script_pokemon_81B9.h
deleted file mode 100644
index d49095fcc..000000000
--- a/include/script_pokemon_81B9.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef GUARD_SCRIPTPOKE81B9_H
-#define GUARD_SCRIPTPOKE81B9_H
-
-#include "global.h"
-
-void sub_81B9404(void);
-
-#endif
diff --git a/include/script_pokemon_util_80A0058.h b/include/script_pokemon_util_80A0058.h
index d0b8949e4..f02193538 100644
--- a/include/script_pokemon_util_80A0058.h
+++ b/include/script_pokemon_util_80A0058.h
@@ -6,5 +6,6 @@ bool8 ScriptGiveEgg(u16 species);
 void ScriptSetMonMoveSlot(u8 partyIdx, u16 move, u8 slot);
 void HealPlayerParty(void);
 void ReducePlayerPartyToThree(void);
+void CreateScriptedWildMon(u16 species, u8 level, u16 item);
 
 #endif //GUARD_SCRIPT_POKEMON_UTIL_80A0058_H
diff --git a/include/text.h b/include/text.h
index eaf125b05..e538123fd 100644
--- a/include/text.h
+++ b/include/text.h
@@ -255,7 +255,6 @@ u8 DrawKeypadIcon(u8 windowId, u8 keypadIconId, u16 x, u16 y);
 u8 GetKeypadIconTileOffset(u8 keypadIconId);
 u8 GetKeypadIconWidth(u8 keypadIconId);
 u8 GetKeypadIconHeight(u8 keypadIconId);
-void SetDefaultFontsPointer(void);
 u8 GetFontAttribute(u8 fontId, u8 attributeId);
 u8 GetMenuCursorDimensionByFont(u8 fontId, u8 whichDimension);
 void DecompressGlyphFont0(u16 glyphId, bool32 isJapanese);