diff options
author | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
---|---|---|
committer | Evan <eroelke@gmail.com> | 2019-11-21 10:23:49 -0700 |
commit | b18ec47b1393d562655e50d30acb3de191423581 (patch) | |
tree | 7959a1477120baf656599794b423aa8cc11ea0c0 /include/battle_bg.h | |
parent | 359d345913d7f5ed36c34ede5476fff946318ffd (diff) | |
parent | 2d284654440cb77365639bf107c31b44326362e3 (diff) |
fix conflicts
Diffstat (limited to 'include/battle_bg.h')
-rw-r--r-- | include/battle_bg.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_bg.h b/include/battle_bg.h index 29571b410..61c106b64 100644 --- a/include/battle_bg.h +++ b/include/battle_bg.h @@ -5,7 +5,7 @@ extern const struct BgTemplate gBattleBgTemplates[]; -void sub_800F34C(void); +void InitBattleBgsVideo(void); void DrawBattleEntryBackground(void); void sub_800F6FC(u8 taskId); void LoadBattleMenuWindowGfx(void); |