diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-17 17:36:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-17 17:36:03 -0400 |
| commit | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/script_pokemon_util_80F99CC.c | |
| parent | dda361afb7e2abafc15a498968580be6d1a83cfe (diff) | |
| parent | 8b97aa28047d5bbc24448b47cbda901a3adb9d0e (diff) | |
Merge pull request #310 from marijnvdwerf/clean/headers
Clean up headers
Diffstat (limited to 'src/script_pokemon_util_80F99CC.c')
| -rw-r--r-- | src/script_pokemon_util_80F99CC.c | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c index ee140187f..606cd9dd4 100644 --- a/src/script_pokemon_util_80F99CC.c +++ b/src/script_pokemon_util_80F99CC.c @@ -1,9 +1,13 @@ #include "global.h" -#include "asm.h" #include "battle_party_menu.h" +#include "choose_party.h" +#include "contest.h" #include "data2.h" +#include "field_fadetransition.h" #include "palette.h" +#include "party_menu.h" #include "pokemon.h" +#include "pokemon_summary_screen.h" #include "rom4.h" #include "script.h" #include "script_pokemon_80F9.h" @@ -20,22 +24,6 @@ extern u16 gScriptResult; extern void (*gFieldCallback)(void); -extern void OpenPartyMenu(u8, u8); -extern void TryCreatePartyMenuMonIcon(u8, u8, struct Pokemon *); -extern void LoadHeldItemIconGraphics(void); -extern void CreateHeldItemIcons_806DC34(); // undefined args -extern u8 sub_806BD58(u8, u8); -extern void PartyMenuPrintMonsLevelOrStatus(void); -extern void PrintPartyMenuMonNicknames(void); -extern u8 sub_806B58C(u8); -extern u8 sub_80AE47C(struct Pokemon *party); -extern void sub_806BC3C(u8, u8); -extern u16 sub_806BD80(); // undefined args in battle_party_menu.c -extern u8 sub_806CA38(); -extern void sub_8123138(u8); -extern u8 sub_8040574(struct Pokemon *party); -extern void sub_809D9F0(struct Pokemon *party, u8, u8, void *, u32); - void sub_80F99CC(void) { u8 taskId; @@ -71,7 +59,7 @@ void sub_80F9A8C(u8 taskId) if(!gPaletteFade.active) { gPaletteFade.bufferTransferDisabled = 1; - OpenPartyMenu(gTasks[taskId].data[0], 0); + OpenPartyMenu((u8) gTasks[taskId].data[0], 0); DestroyTask(taskId); } } |