diff options
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 15b09645f..fd44d2fc6 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1,11 +1,15 @@ #include "global.h" +#include "battle_setup.h" +#include "safari_zone.h" +#include "weather.h" +#include "palette.h" +#include "field_player_avatar.h" +#include "rom4.h" #include "battle.h" #include "main.h" #include "species.h" -#include "pokemon.h" #include "songs.h" #include "task.h" -#include "fieldmap.h" #include "string_util.h" #include "rng.h" #include "flag.h" @@ -13,6 +17,7 @@ #include "script.h" #include "field_message_box.h" #include "trainer.h" +#include "starter_choose.h" #define NUM_TRAINER_EYE_TRAINERS 56 #define TRAINER_REMATCH_STEPS 255 @@ -23,28 +28,28 @@ extern void current_map_music_set__default_for_battle(u16); extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); extern void c2_exit_to_overworld_2_switch(void); extern void npc_set_running_behaviour_etc(struct MapObject *, u8); +extern u8 npc_running_behaviour_by_direction(u8); extern void c2_whiteout(void); extern void sub_800E7C4(void); extern void sub_8081AA4(void); extern void sub_8081A18(void); extern void sub_8081C8C(void); -extern void sub_80C824C(void); extern void sub_8081CEC(void); extern void sub_8080E44(void); extern void sub_80821D8(void); extern void sub_8082228(void); extern void sub_808260C(void); extern void sub_8082CB8(void); +extern void sub_811AAD8(u8); extern u8 *sub_80BCCE8(void); -extern void CB2_ChooseStarter(void); extern void sub_811AABC(u8); extern u8 sub_811AAE8(void); extern u8 GetFieldObjectIdByLocalIdAndMap(u8, u8, u8); extern u8 *sub_8082880(void); extern u8 sub_803FC58(u16); extern bool32 FieldPoisonEffectIsRunning(void); -extern bool32 GetSafariZoneFlag(void); extern void player_bitmagic(void); +extern void sub_80408BC(); u8 GetWildBattleTransition(void); u8 GetTrainerBattleTransition(void); @@ -99,7 +104,6 @@ struct TrainerEyeTrainer u16 mapNum; }; -extern u16 MapGridGetMetatileBehaviorAt(s16, s16); extern bool8 MetatileBehavior_IsTallGrass(char); extern bool8 MetatileBehavior_IsLongGrass(char); extern bool8 MetatileBehavior_IsSandOrDeepSand(char); @@ -108,9 +112,7 @@ extern bool8 MetatileBehavior_IsBridge(char); extern bool8 sub_80574C4(char); extern bool8 sub_80574D8(char); extern bool8 sub_8057568(char); -extern u8 TestPlayerAvatarFlags(u8); extern u8 sub_8057450(u8); -extern u8 GetSav1Weather(void); extern void PlayNewMapMusic(u16); extern u8 ScriptGiveMon(u16, u8, u16, u32, u32, u8); |