diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-06-17 19:46:25 -0500 |
| commit | 82ddae9db42f45abf876e68dc9b0b69a00b44070 (patch) | |
| tree | 26e39c75e92ca8cf128b9143c0e664b06bff23a9 /src/battle_party_menu.c | |
| parent | c56305607a1bad264b89d07b7539eff3fe010e0d (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_party_menu.c')
| -rw-r--r-- | src/battle_party_menu.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/battle_party_menu.c b/src/battle_party_menu.c index c2183e6bb..074ebbce0 100644 --- a/src/battle_party_menu.c +++ b/src/battle_party_menu.c @@ -1,11 +1,16 @@ #include "global.h" #include "battle_party_menu.h" -#include "asm.h" +#include "battle.h" +#include "item_menu.h" #include "main.h" #include "menu.h" +#include "menu_helpers.h" #include "palette.h" #include "party_menu.h" #include "pokemon.h" +#include "pokemon_summary_screen.h" +#include "rom_8077ABC.h" +#include "rom_8094928.h" #include "songs.h" #include "sound.h" #include "string_util.h" @@ -64,11 +69,13 @@ extern u8 gUnknown_02038473; extern u8 gUnknown_020384F0; extern void (*gUnknown_03004AE4)(); //don't know types yet extern struct PokemonStorage gPokemonStorage; +extern void nullsub_14(); void sub_8094C98(u8, u8); +u8 pokemon_order_func(u8); + static void sub_8094998(u8[3], u8); static void sub_8094A74(u8[3], u8, u32); -u8 pokemon_order_func(u8); static void sub_8094D60(void); static void Task_809527C(u8); static void Task_80952B4(u8); |