diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-11 14:50:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-11 14:50:18 -0600 |
| commit | 14a76793e596d612efd273169c4172922c270f13 (patch) | |
| tree | 9517f097031e48ed4dd590ee772875a0da48c652 /src/battle_setup.c | |
| parent | 387dbf48d0bbb22dc16158a1ee0d373c166c8438 (diff) | |
| parent | d704a2b5df0a7957f6df06669cf4423e5026d87b (diff) | |
Merge pull request #206 from DizzyEggg/battle_labels
More battle code clean up
Diffstat (limited to 'src/battle_setup.c')
| -rw-r--r-- | src/battle_setup.c | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c index 96af536fe..52ed99b21 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -30,6 +30,8 @@ #include "strings.h" #include "secret_base.h" #include "string_util.h" +#include "overworld.h" +#include "field_weather.h" enum { @@ -59,14 +61,11 @@ extern void sub_81BE72C(void); extern void FreezeMapObjects(void); extern void sub_808BCF4(void); extern void sub_80EECC8(void); -extern void c2_exit_to_overworld_1_continue_scripts_restart_music(void); -extern void c2_exit_to_overworld_2_switch(void); extern void Overworld_ClearSavedMusic(void); extern void CB2_WhiteOut(void); extern void sub_80AF6F0(void); extern void PlayBattleBGM(void); extern void sub_81DA57C(void); -extern u8 GetSav1Weather(void); extern u8 Overworld_GetFlashLevel(void); extern u16 sub_81A9AA8(u8 localId); extern u16 sub_81D6180(u8 localId); @@ -82,12 +81,6 @@ extern void sub_81D61E8(void); extern void sub_80982B8(void); extern void sub_81A9EDC(u16 a0); extern void sub_81D572C(u8 a0, u16 arg1); -extern void IncrementGameStat(u8 statId); -extern u32 GetGameStat(u8 statId); - -extern u32 gBattleTypeFlags; -extern u8 gBattleOutcome; -extern void (*gFieldCallback)(void); // this file's functions static void DoBattlePikeWildBattle(void); @@ -996,8 +989,8 @@ static bool32 IsPlayerDefeated(u32 battleOutcome) case B_OUTCOME_WON: case B_OUTCOME_RAN: case B_OUTCOME_PLAYER_TELEPORTED: - case B_OUTCOME_POKE_FLED: - case B_OUTCOME_CAUGHT_POKE: + case B_OUTCOME_MON_FLED: + case B_OUTCOME_CAUGHT: return FALSE; default: return FALSE; |