diff options
| author | garak <garakmon@gmail.com> | 2018-10-15 14:53:21 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-15 14:53:21 -0400 |
| commit | 281824e3c4f3e678fa947290182ee91e85c8b568 (patch) | |
| tree | 01fee901770d1c7ebc2c00ab85df1b8c1a5f45cb /src/battle/battle_interface.c | |
| parent | ca685eb9e661523c79467a72a077775738f8bd45 (diff) | |
| parent | 09b8f4c09e69a2359cdf5e4497b97aca3746b8b1 (diff) | |
Merge remote-tracking branch 'upstream/master' into battle-anim-labels
Diffstat (limited to 'src/battle/battle_interface.c')
| -rw-r--r-- | src/battle/battle_interface.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle/battle_interface.c b/src/battle/battle_interface.c index ec882bcce..dedde2cb3 100644 --- a/src/battle/battle_interface.c +++ b/src/battle/battle_interface.c @@ -433,7 +433,7 @@ extern u16 gBattleTypeFlags; extern const u8 BattleText_SafariBalls[]; extern const u8 BattleText_SafariBallsLeft[]; extern const u8 BattleText_HighlightRed[]; -extern const u8 gUnknown_08D1216C[][32]; +extern const u8 gHealthboxElementsGfxTable[][32]; extern const u16 gBattleInterfaceStatusIcons_DynPal[]; @@ -870,7 +870,7 @@ u8 battle_make_oam_safari_battle(void) static const void *sub_8043CDC(u8 a) { - return gUnknown_08D1216C[a]; + return gHealthboxElementsGfxTable[a]; } static void sub_8043CEC(struct Sprite *sprite) |