diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:33:21 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-11-06 11:33:21 -0600 |
| commit | 43a8534fced2c4327acdd8dc9690f5bc6751e2db (patch) | |
| tree | 33797ee29121db198f87afe10e4f2d27bc5cc9ec /include | |
| parent | f8d337e491f531285f6067e2e7f39a8d606036d6 (diff) | |
| parent | 32d2640dc728055923b0e6120277093fcae5e9c3 (diff) | |
Merge remote-tracking branch 'origin/master' into render_text
Diffstat (limited to 'include')
| -rw-r--r-- | include/load_save.h | 2 | ||||
| -rw-r--r-- | include/script_pokemon_util_80F87D8.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/include/load_save.h b/include/load_save.h index 5fb5f6c42..b8b27ade5 100644 --- a/include/load_save.h +++ b/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); diff --git a/include/script_pokemon_util_80F87D8.h b/include/script_pokemon_util_80F87D8.h index 68aec7eb6..7c2a1ff66 100644 --- a/include/script_pokemon_util_80F87D8.h +++ b/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 |