diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/fldeff_softboiled.c | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/fldeff_softboiled.c')
| -rw-r--r-- | src/fldeff_softboiled.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c index d0ee712af..45f319c62 100644 --- a/src/fldeff_softboiled.c +++ b/src/fldeff_softboiled.c @@ -1,7 +1,9 @@ #include "global.h" -#include "asm.h" +#include "fldeff_softboiled.h" #include "menu.h" +#include "party_menu.h" #include "pokemon.h" +#include "pokemon_menu.h" #include "songs.h" #include "sound.h" #include "sprite.h" @@ -62,10 +64,6 @@ extern u8 gLastFieldPokeMenuOpened; extern u8 unk_2000000[]; extern u8 gUnknown_0202E8F4; -// Public -bool8 SetUpFieldMove_SoftBoiled(void); -void sub_8133D28(u8 taskid); - // Static static void sub_8133D50(u8 taskId); static void sub_8133E74(u8 taskId); |