diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
| commit | 27ee7d567e34b76c737c4920cfeccc36e6221543 (patch) | |
| tree | 8df67f69c86109bb42e060100e2390ed20b33c61 /src/pokemon.c | |
| parent | 1b0cfb075723af7b457ec118eca2888df449bf9e (diff) | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT
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); |