diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 15:39:21 -0500 |
---|---|---|
committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 16:03:06 -0500 |
commit | f2763832931127fc24e7cb9f9cdd85e3cf706a5c (patch) | |
tree | d23050509231d1d9c6d1694b2755c93fdaf26a4e /include/graphics.h | |
parent | aa84a1d3a11c7cc6fd0e1021e1ed060e0c5683f2 (diff) | |
parent | 15ff7eb2f87032797f6ce9ef9bb471c468b48a36 (diff) |
Merge master into sync-script
Diffstat (limited to 'include/graphics.h')
-rw-r--r-- | include/graphics.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/graphics.h b/include/graphics.h index dc0389420..a668364bd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -4854,4 +4854,11 @@ extern const u32 gFireRedTrainerCard_Gfx[]; extern const u16 gEmeraldTrainerCard_Pal[]; extern const u32 gEmeraldTrainerCard_Gfx[]; +// battle_interface +extern const u32 gFile_graphics_battle_interface_ball_status_bar_sheet[]; +extern const u8 gHealthboxElementsGfxTable[][32]; +extern const u16 gBattleInterface_BallStatusBarPal[]; +extern const u16 gBattleInterface_BallDisplayPal[]; +extern const u16 gUnknown_8D12404[]; + #endif //GUARD_GRAPHICS_H |