diff options
| author | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-11-27 13:31:07 -0500 |
| commit | 50f00b0827a4952a12f90009bd992f23c80a56af (patch) | |
| tree | 6a5f78b04b42c162ed95cfc66c91a8b24f4051b2 /src/pokemon.c | |
| parent | f02cb667bbddf4f4a1152c86cbf9616468e7f0d2 (diff) | |
| parent | c909aa92dee0a8d202d9195d80d0cc96b0d1ebc8 (diff) | |
Merge remote-tracking branch 'upstream/master' into fldeff
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); |