diff options
| author | yenatch <yenatch@gmail.com> | 2017-10-08 23:54:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-08 23:54:46 -0400 |
| commit | b0d49dbbfbfcf39c2a9f88572437b6af77c8f709 (patch) | |
| tree | be0dadd4cb3a6c36e27233836a6f104359d49949 /include/script_pokemon_80C4.h | |
| parent | b21c159b08c57a948edb268ac9b9b5baf6b4332d (diff) | |
| parent | 3776a9fb4f0531535b0b5879dab7b3b6bd231736 (diff) | |
Merge branch 'master' into scaninc
Diffstat (limited to 'include/script_pokemon_80C4.h')
| -rw-r--r-- | include/script_pokemon_80C4.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/script_pokemon_80C4.h b/include/script_pokemon_80C4.h index 629980a2d..fab07994e 100644 --- a/include/script_pokemon_80C4.h +++ b/include/script_pokemon_80C4.h @@ -8,10 +8,10 @@ void ReducePlayerPartyToThree(void); u8 sub_80C4D50(void); void ShowContestWinner(void); -void HealPlayerParty(); +void ScrSpecial_HealPlayerParty(); u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8); u8 ScriptGiveEgg(u16); -void ScriptWildBattle(u16, u8, u16); +void CreateScriptedWildMon(u16, u8, u16); void ScriptSetMonMoveSlot(u8, u16, u8); #endif |