diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-18 13:09:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-18 13:09:19 -0600 |
| commit | e8415c51d199dd19ed122fef57ff5d09971cc5ea (patch) | |
| tree | ab117a11b93c66c0c333300b2e053a77275bae8e /src/pokemon.c | |
| parent | 032dd251e628debd1ec7774fa42b6e7d39b3d83b (diff) | |
| parent | f2d3babd30c51b79c48d065f809273a10929a2ee (diff) | |
Merge pull request #387 from DizzyEggg/battle_pyramid
Battle pyramid
Diffstat (limited to 'src/pokemon.c')
| -rw-r--r-- | src/pokemon.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pokemon.c b/src/pokemon.c index 47c4f9217..0f7c80b77 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4,6 +4,7 @@ #include "battle_controllers.h" #include "battle_message.h" #include "battle_pike.h" +#include "battle_pyramid.h" #include "battle_setup.h" #include "battle_tower.h" #include "event_data.h" @@ -81,9 +82,7 @@ extern u8 StorageGetCurrentBox(void); extern void set_unknown_box_id(u8); extern void sub_803FA70(u8 battlerId); extern u8 sav1_map_get_name(void); -extern bool8 InBattlePyramid(void); extern bool8 sub_806F104(void); -extern u8 GetTrainerEncounterMusicIdInBattlePyramind(u16 trainerOpponentId); extern u8 sub_81D63C8(u16 trainerOpponentId); extern void SummaryScreen_SetUnknownTaskId(u8); |