diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-20 17:21:46 +0100 |
| commit | 504363f2a686d3b7381ba0b7917a245ca422f024 (patch) | |
| tree | f9caa860a20c9f8e23a1247b80dfc1748e9d0bb9 /include/battle.h | |
| parent | 4abc2eea8aee0efc714df8519533c55fbabae5f1 (diff) | |
| parent | 7e6a68a99a832383e7cbf3c91aef321dd46ed61f (diff) | |
Merge branch 'master' into decompile_trainer_see
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/include/battle.h b/include/battle.h index 71dbe9a57..602d3eb53 100644 --- a/include/battle.h +++ b/include/battle.h @@ -8,6 +8,7 @@ #include "battle_ai_switch_items.h" #include "battle_gfx_sfx_util.h" #include "battle_util2.h" +#include "battle_bg.h" /* Banks are a name given to what could be called a 'battlerId' or 'monControllerId'. @@ -863,16 +864,6 @@ struct BattleScripting extern struct BattleScripting gBattleScripting; -// functions - -// battle_1 -void LoadBattleTextboxAndBackground(void); -void LoadBattleEntryBackground(void); -void ApplyPlayerChosenFrameToBattleMenu(void); -bool8 LoadChosenBattleElement(u8 caseId); -void DrawMainBattleBackground(void); -void task00_0800F6FC(u8 taskId); - enum { BACK_PIC_BRENDAN, |