diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2018-12-25 15:03:13 -0600 |
commit | d8948a5cda2e385c1d4b5c6190c4fe0fb53359fb (patch) | |
tree | fa882b0733f88cc17dcbaef8c25c30c7198bdca1 /src/battle_pyramid.c | |
parent | dea41e1a7e6e73789431153d6c28dac3a3a73ac6 (diff) | |
parent | a54aa03d20dacc88879404b87a5f6a7eb7babc54 (diff) |
Merge remote-tracking branch 'pret/master' into trade
Diffstat (limited to 'src/battle_pyramid.c')
-rw-r--r-- | src/battle_pyramid.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c index 45aca91c8..244e61d17 100644 --- a/src/battle_pyramid.c +++ b/src/battle_pyramid.c @@ -8,7 +8,9 @@ #include "save.h" #include "strings.h" #include "fieldmap.h" +#include "party_menu.h" #include "palette.h" +#include "field_screen_effect.h" #include "field_message_box.h" #include "random.h" #include "item.h" @@ -32,9 +34,6 @@ #include "constants/moves.h" #include "constants/species.h" -extern u8 gSelectedOrderFromParty[3]; -extern void door_upload_tiles(void); - extern const struct MapLayout *const gMapLayouts[]; extern const u16 gUnknown_08D856C8[][16]; |