fix merge conflicts, evo scene

1 files changed, 13 insertions, 1 deletions

diff --git a/include/battle_interface.h b/include/battle_interface.h
index 05ea1c021..aad30f7b3 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -3,6 +3,18 @@
 
 #include "battle_controllers.h"
 
+enum
+{
+    HP_CURRENT,
+    HP_MAX
+};
+
+enum
+{
+    HEALTH_BAR,
+    EXP_BAR
+};
+
 #define TAG_HEALTHBOX_PLAYER1_TILE      0xD6FF
 #define TAG_HEALTHBOX_PLAYER2_TILE      0xD700
 #define TAG_HEALTHBOX_OPPONENT1_TILE    0xD701
@@ -35,7 +47,7 @@ enum
 
 u8 CreateBankHealthboxSprites(u8 bank);
 u8 CreateSafariPlayerHealthboxSprites(void);
-void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 field_C);
+void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
 void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
 void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
 void DestoryHealthboxSprite(u8 healthboxSpriteId);