Merge remote-tracking branch 'origin/master' into render_text

include/load_save.h

@@ -17,7 +17,7 @@ void SetSaveBlocksPointers(u16 offset);
 void MoveSaveBlocks_ResetHeap(void);
 u32 GetSecretBase2Field_9(void);
 void ClearSecretBase2Field_9(void);
-void sub_8076D48(void);
+void SetSecretBase2Field_9(void);
 void sub_8076D5C(void);
 void sav2_gender2_inplace_and_xFE(void);
 void SavePlayerParty(void);

include/script_pokemon_util_80F87D8.h

@@ -4,5 +4,6 @@
 
 u16 sub_80F903C(void);
 void ReducePlayerPartyToThree(void);
+void HealPlayerParty(void);
 
 #endif // GUARD_SCRIPT_POKEMON_UTIL_80F87D8_H