diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-03-09 22:54:57 +0100 |
| commit | 711a345fd43da3edf0d1eed99e9df646c436ba16 (patch) | |
| tree | e8fa8e32ed217ccd7f8d46e333bedfdd9977a3d7 /src/battle_setup.c | |
| parent | 70ec55386ce640b6844f7c0bf93a7a447888cb66 (diff) | |
| parent | ae214eca8b9086db64af3741aecaf05acf007b96 (diff) | |
fix conflicts
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index fa1eb7edc..97e8f7041 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -32,6 +32,7 @@ #include "overworld.h" #include "field_weather.h" #include "gym_leader_rematch.h" +#include "field_map_obj_helpers.h" enum { @@ -56,18 +57,12 @@ extern bool8 InBattlePyramid(void); extern bool8 InBattlePike(void); extern bool32 InTrainerHill(void); extern bool32 FieldPoisonEffectIsRunning(void); -extern void overworld_free_bg_tilemaps(void); extern void prev_quest_postbuffer_cursor_backup_reset(void); extern void ResetPoisonStepCounter(void); extern void sub_81BE72C(void); -extern void FreezeMapObjects(void); extern void sub_808BCF4(void); extern void sub_80EECC8(void); -extern void Overworld_ClearSavedMusic(void); -extern void CB2_WhiteOut(void); extern void sub_80AF6F0(void); -extern void PlayBattleBGM(void); -extern u8 Overworld_GetFlashLevel(void); extern u16 sub_81A9AA8(u8 localId); extern u16 sub_81D6180(u8 localId); extern bool8 GetBattlePyramidTrainerFlag(u8 mapObjId); |