diff --git a/platinumus.xMAP b/platinumus.xMAP
index 28fe9faf44..d4920ce6b6 100644
--- a/platinumus.xMAP
+++ b/platinumus.xMAP
@@ -22342,8 +22342,8 @@
                                                46](Task_RecordingShowYesNoMenu,func) found in local src_battle_battle_display.c.o
                                                46](Task_PlayerSetCommandSelection,func) found in local src_battle_battle_display.c.o
                                                 47](ov16_0223E02C,func) found in global src_battle_battle_system.c.o
-                                                47](BattleSystem_GetHealthbar,func) found in global src_battle_battle_system.c.o
-                                                 48](BattlerData_GetHealthbar,func) found in global src_battle_battle_display.c.o
+                                                47](BattleSystem_GetHealthBox,func) found in global src_battle_battle_system.c.o
+                                                 48](BattlerData_GetHealthBox,func) found in global src_battle_battle_display.c.o
                                                 47](ov16_0226AC98,func) found in global src_battle_battle_cursor.c.o
                                                  48](MessageUtil_MoveName,func) found in global src_message_util.c.o
                                                  48](ov16_0226AEA0,func) found in local src_battle_battle_cursor.c.o
@@ -22378,14 +22378,14 @@
                                                 47](BattleSystem_GetTrainerGender,func) found in global src_battle_battle_system.c.o
                                                 47](BattleSystem_GetTextSpeed,func) found in global src_battle_battle_system.c.o
                                                 47](Battler_GetTrainerID,func) found in global src_battle_battle_system.c.o
-                                                47](ov16_0226757C,func) found in global src_battle_healthbar.c.o
-                                                 48](Healthbar_EnableArrow,func) found in local src_battle_healthbar.c.o
-                                                 48](ov16_02268470,func) found in global src_battle_healthbar.c.o
-                                                  49](ov16_022684BC,func) found in local src_battle_healthbar.c.o
-                                                   50](Healthbar_OffsetPositionXY,func) found in global src_battle_healthbar.c.o
-                                                    51](Healthbar_SpriteTemplate,func) found in local src_battle_healthbar.c.o
-                                                     52](sHealthbarTemplate_SoloPlayer,object) found in local src_battle_healthbar.c.o
-                                                    51](sArrowOffsetX,object) found in local src_battle_healthbar.c.o
+                                                47](ov16_0226757C,func) found in global src_battle_healthbox.c.o
+                                                 48](HealthBox_EnableArrow,func) found in local src_battle_healthbox.c.o
+                                                 48](ov16_02268470,func) found in global src_battle_healthbox.c.o
+                                                  49](ov16_022684BC,func) found in local src_battle_healthbox.c.o
+                                                   50](HealthBox_OffsetPositionXY,func) found in global src_battle_healthbox.c.o
+                                                    51](HealthBox_SpriteTemplate,func) found in local src_battle_healthbox.c.o
+                                                     52](sHealthBoxTemplate_SoloPlayer,object) found in local src_battle_healthbox.c.o
+                                                    51](sArrowOffsetX,object) found in local src_battle_healthbox.c.o
                                                 47](ov16_02264798,func) found in global src_battle_ov16_02264798.c.o
                                                  48](ov16_02264800,func) found in local src_battle_ov16_02264798.c.o
                                                 47](ov16_02269348,func) found in global src_battle_battle_cursor.c.o
@@ -22396,38 +22396,38 @@
                                                 47](ov16_02269168,func) found in global src_battle_battle_cursor.c.o
                                                  48](ov16_0226A934,func) found in local src_battle_battle_cursor.c.o
                                                 47](ov16_022691BC,func) found in global src_battle_battle_cursor.c.o
-                                                47](ov16_02268468,func) found in global src_battle_healthbar.c.o
-                                                47](ov16_0226737C,func) found in global src_battle_healthbar.c.o
-                                                 48](GetHealthbarPartsTile,func) found in local src_battle_healthbar.c.o
-                                                  49](sHealthbarPartsBitmap,object) found in global src_battle_healthbar.c.o
-                                                 48](Healthbar_DrawInfo,func) found in global src_battle_healthbar.c.o
-                                                  49](Healthbar_CalcHP,func) found in global src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawGauge,func) found in local src_battle_healthbar.c.o
-                                                   50](UpdateGauge,func) found in local src_battle_healthbar.c.o
-                                                   50](CalcGaugeFill,func) found in local src_battle_healthbar.c.o
-                                                   50](DrawGauge,func) found in local src_battle_healthbar.c.o
-                                                    51](FillCells,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawCurrentHP,func) found in local src_battle_healthbar.c.o
+                                                47](ov16_02268468,func) found in global src_battle_healthbox.c.o
+                                                47](ov16_0226737C,func) found in global src_battle_healthbox.c.o
+                                                 48](GetHealthBoxPartsTile,func) found in local src_battle_healthbox.c.o
+                                                  49](sHealthBoxPartsBitmap,object) found in global src_battle_healthbox.c.o
+                                                 48](HealthBox_DrawInfo,func) found in global src_battle_healthbox.c.o
+                                                  49](HealthBox_CalcHP,func) found in global src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawGauge,func) found in local src_battle_healthbox.c.o
+                                                   50](UpdateGauge,func) found in local src_battle_healthbox.c.o
+                                                   50](CalcGaugeFill,func) found in local src_battle_healthbox.c.o
+                                                   50](DrawGauge,func) found in local src_battle_healthbox.c.o
+                                                    51](FillCells,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawCurrentHP,func) found in local src_battle_healthbox.c.o
                                                    50](BattleSystem_GetSpecialCharsHP,func) found in global src_battle_battle_system.c.o
                                                    50](FontSpecialChars_DrawBattleScreenText,func) found in global src_font_special_chars.c.o
-                                                  49](Healthbar_DrawMaxHP,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawLevelText,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawLevelNumber,func) found in local src_battle_healthbar.c.o
+                                                  49](HealthBox_DrawMaxHP,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawLevelText,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawLevelNumber,func) found in local src_battle_healthbox.c.o
                                                    50](BattleSystem_GetSpecialCharsLevel,func) found in global src_battle_battle_system.c.o
-                                                  49](Healthbar_DrawBattlerName,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_CalcExp,func) found in global src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawCaughtIcon,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawStatusIcon,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawBallCount,func) found in local src_battle_healthbar.c.o
-                                                  49](Healthbar_DrawBallsLeftMessage,func) found in local src_battle_healthbar.c.o
+                                                  49](HealthBox_DrawBattlerName,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_CalcExp,func) found in global src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawCaughtIcon,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawStatusIcon,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawBallCount,func) found in local src_battle_healthbox.c.o
+                                                  49](HealthBox_DrawBallsLeftMessage,func) found in local src_battle_healthbox.c.o
                                                 47](BattleSystem_MenuInput,func) found in global src_battle_battle_cursor.c.o
                                                  48](ov16_0226CD18,func) found in local src_battle_battle_cursor.c.o
                                                   49](ov16_0226CE34,func) found in local src_battle_battle_cursor.c.o
                                                  48](BattleSystem_MenuKeys,func) found in local src_battle_battle_cursor.c.o
                                                  48](ov16_0226DDE8,func) found in global src_battle_ov16_0226DB7C.c.o
-                                                47](ov16_0226846C,func) found in global src_battle_healthbar.c.o
-                                                47](ov16_022675AC,func) found in global src_battle_healthbar.c.o
-                                                 48](ov16_02268498,func) found in global src_battle_healthbar.c.o
+                                                47](ov16_0226846C,func) found in global src_battle_healthbox.c.o
+                                                47](ov16_022675AC,func) found in global src_battle_healthbox.c.o
+                                                 48](ov16_02268498,func) found in global src_battle_healthbox.c.o
                                                 47](ov16_022647D8,func) found in global src_battle_ov16_02264798.c.o
                                                 47](ov16_0226D088,func) found in global src_battle_battle_cursor.c.o
                                                 47](ov16_02269218,func) found in global src_battle_battle_cursor.c.o
@@ -23600,8 +23600,8 @@
                                                    50](BattleAnimScriptCmd_BeginLoop,func) found in local src_battle_anim_battle_anim_system.c.o
                                                    50](BattleAnimScriptCmd_WaitForAnimTasks,func) found in local src_battle_anim_battle_anim_system.c.o
                                                    50](BattleAnimScriptCmd_Delay,func) found in local src_battle_anim_battle_anim_system.c.o
-                                                47](Healthbar_Type,func) found in global src_battle_healthbar.c.o
-                                                47](ov16_022674F8,func) found in global src_battle_healthbar.c.o
+                                                47](HealthBox_Type,func) found in global src_battle_healthbox.c.o
+                                                47](ov16_022674F8,func) found in global src_battle_healthbox.c.o
                                                 47](BattleAnimSystem_ExecuteScript,func) found in global src_battle_anim_battle_anim_system.c.o
                                                 47](BattleAnimSystem_IsMoveActive,func) found in global src_battle_anim_battle_anim_system.c.o
                                                 47](BattleAnimSystem_FreeScriptData,func) found in global src_battle_anim_battle_anim_system.c.o
@@ -23737,12 +23737,12 @@
                                              44](ov16_0223C004,func) found in local src_battle_battle_main.c.o
                                               45](ov16_0223CE68,func) found in local src_battle_battle_main.c.o
                                              44](ov16_0223F36C,func) found in global src_battle_battle_system.c.o
-                                              45](ov16_022672C4,func) found in global src_battle_healthbar.c.o
-                                               46](Healthbar_LoadResources,func) found in global src_battle_healthbar.c.o
-                                               46](Healthbar_DrawSprite,func) found in global src_battle_healthbar.c.o
-                                               46](Healthbar_LoadMainPalette,func) found in local src_battle_healthbar.c.o
-                                                47](ov16_02268314,func) found in local src_battle_healthbar.c.o
-                                              45](Healthbar_Enable,func) found in global src_battle_healthbar.c.o
+                                              45](ov16_022672C4,func) found in global src_battle_healthbox.c.o
+                                               46](HealthBox_LoadResources,func) found in global src_battle_healthbox.c.o
+                                               46](HealthBox_DrawSprite,func) found in global src_battle_healthbox.c.o
+                                               46](HealthBox_LoadMainPalette,func) found in local src_battle_healthbox.c.o
+                                                47](ov16_02268314,func) found in local src_battle_healthbox.c.o
+                                              45](HealthBox_Enable,func) found in global src_battle_healthbox.c.o
                                              44](ov16_0223CE28,func) found in local src_battle_battle_main.c.o
                                              44](BattleAnimSystem_New,func) found in global src_battle_anim_battle_anim_system.c.o
                                              44](ov16_0223C210,func) found in local src_battle_battle_main.c.o
@@ -24173,7 +24173,7 @@
                                                     51](badgeMul$18332,object) found in local src_battle_battle_system.c.o
                                                    50](TrainerInfo_TakeMoney,func) found in global src_trainer_info.c.o
                                                   49](BtlCmd_PrintTrainerMessage,func) found in local src_battle_battle_script.c.o
-                                                  49](BtlCmd_SetHealthbarStatus,func) found in local src_battle_battle_script.c.o
+                                                  49](BtlCmd_SetHealthBoxStatusIcon,func) found in local src_battle_battle_script.c.o
                                                    50](BattleController_EmitSetStatusIcon,func) found in global src_battle_battle_controller.c.o
                                                   49](BtlCmd_UnlockMoveChoice,func) found in local src_battle_battle_script.c.o
                                                   49](BtlCmd_LockMoveChoice,func) found in local src_battle_battle_script.c.o
@@ -24286,11 +24286,11 @@
                                                     51](BattleSystem_GetOptions,func) found in global src_battle_battle_system.c.o
                                                     51](BattleSystem_GetMetBebe,func) found in global src_battle_battle_system.c.o
                                                     51](ov16_0223F414,func) found in global src_battle_battle_system.c.o
-                                                     52](ov16_02267360,func) found in global src_battle_healthbar.c.o
-                                                      53](ov16_02267220,func) found in global src_battle_healthbar.c.o
-                                                      53](ov16_02267258,func) found in global src_battle_healthbar.c.o
-                                                      53](ov16_02267244,func) found in local src_battle_healthbar.c.o
-                                                      53](ov16_0226728C,func) found in local src_battle_healthbar.c.o
+                                                     52](ov16_02267360,func) found in global src_battle_healthbox.c.o
+                                                      53](ov16_02267220,func) found in global src_battle_healthbox.c.o
+                                                      53](ov16_02267258,func) found in global src_battle_healthbox.c.o
+                                                      53](ov16_02267244,func) found in local src_battle_healthbox.c.o
+                                                      53](ov16_0226728C,func) found in local src_battle_healthbox.c.o
                                                     51](ov16_0223B3E4,func) found in global src_battle_battle_main.c.o
                                                      52](ov16_0223C288,func) found in local src_battle_battle_main.c.o
                                                      52](Dummy_0223C2BC,func) found in local src_battle_battle_main.c.o
@@ -24329,7 +24329,7 @@
                                                     51](BattleScript_LoadPartyLevelUpIcon,func) found in local src_battle_battle_script.c.o
                                                      52](BattleSystem_GetMsgBuffer,func) found in global src_battle_battle_system.c.o
                                                     51](BattleSystem_SetGaugePriority,func) found in global src_battle_battle_system.c.o
-                                                     52](ov16_022675D8,func) found in global src_battle_healthbar.c.o
+                                                     52](ov16_022675D8,func) found in global src_battle_healthbox.c.o
                                                     51](BattleMessage_PrintToWindow,func) found in global src_battle_battle_system.c.o
                                                     51](BattleScript_FreePartyLevelUpIcon,func) found in local src_battle_battle_script.c.o
                                                     51](BattleController_EmitForgetMove,func) found in global src_battle_battle_controller.c.o
@@ -24389,11 +24389,11 @@
                                                   49](BtlCmd_CalcDamage,func) found in local src_battle_battle_script.c.o
                                                   49](BtlCmd_Wait,func) found in local src_battle_battle_script.c.o
                                                    50](BattleIO_UpdateTimeout,func) found in global src_battle_battle_lib.c.o
-                                                  49](BtlCmd_HealthbarSlideOut,func) found in local src_battle_battle_script.c.o
-                                                   50](BattleController_EmitSlideHealthbarOut,func) found in global src_battle_battle_controller.c.o
-                                                  49](BtlCmd_HealthbarSlideInDelay,func) found in local src_battle_battle_script.c.o
-                                                   50](BattleController_EmitSlideHealthbarIn,func) found in global src_battle_battle_controller.c.o
-                                                  49](BtlCmd_HealthbarSlideIn,func) found in local src_battle_battle_script.c.o
+                                                  49](BtlCmd_HealthBoxSlideOut,func) found in local src_battle_battle_script.c.o
+                                                   50](BattleController_EmitSlideHealthBoxOut,func) found in global src_battle_battle_controller.c.o
+                                                  49](BtlCmd_HealthBoxSlideInDelay,func) found in local src_battle_battle_script.c.o
+                                                   50](BattleController_EmitSlideHealthBoxIn,func) found in global src_battle_battle_controller.c.o
+                                                  49](BtlCmd_HealthBoxSlideIn,func) found in local src_battle_battle_script.c.o
                                                   49](BtlCmd_BackgroundSlideIn,func) found in local src_battle_battle_script.c.o
                                                    50](ov16_02266460,func) found in global src_battle_battle_controller.c.o
                                                   49](BtlCmd_TrainerSlideIn,func) found in local src_battle_battle_script.c.o
@@ -24577,8 +24577,8 @@
                                                46](BtlIOCmd_PlayLevelUpAnimation,func) found in local src_battle_battle_io_command.c.o
                                                 47](BattleDisplay_InitTaskPlayLevelUpAnimation,func) found in global src_battle_battle_display.c.o
                                                  48](Task_PlayLevelUpAnimation,func) found in local src_battle_battle_display.c.o
-                                                  49](ov16_0226834C,func) found in global src_battle_healthbar.c.o
-                                                   50](ov16_02268380,func) found in local src_battle_healthbar.c.o
+                                                  49](ov16_0226834C,func) found in global src_battle_healthbox.c.o
+                                                   50](ov16_02268380,func) found in local src_battle_healthbox.c.o
                                                     51](SpriteManager_FindPlttResourceOffset,func) found in global src_sprite_system.c.o
                                                46](BtlIOCmd_PrintLeadMonMessage,func) found in local src_battle_battle_io_command.c.o
                                                 47](BattleDisplay_PrintLeadMonMessage,func) found in global src_battle_battle_display.c.o
@@ -24613,7 +24613,7 @@
                                                46](BtlIOCmd_UpdateExpGauge,func) found in local src_battle_battle_io_command.c.o
                                                 47](BattleDisplay_InitTaskUpdateExpGauge,func) found in global src_battle_battle_display.c.o
                                                  48](Task_UpdateExpGauge,func) found in local src_battle_battle_display.c.o
-                                                  49](ov16_02267560,func) found in global src_battle_healthbar.c.o
+                                                  49](ov16_02267560,func) found in global src_battle_healthbox.c.o
                                                46](BtlIOCmd_UpdateHPGauge,func) found in local src_battle_battle_io_command.c.o
                                                 47](BattleDisplay_InitTaskUpdateHPGauge,func) found in global src_battle_battle_display.c.o
                                                  48](Task_UpdateHPGauge,func) found in local src_battle_battle_display.c.o
@@ -24645,14 +24645,14 @@
                                                46](BtlIOCmd_SetCommandSelection,func) found in local src_battle_battle_io_command.c.o
                                                 47](ov16_0223F290,func) found in global src_battle_battle_system.c.o
                                                 47](BattleDisplay_InitTaskSetCommandSelection,func) found in global src_battle_battle_display.c.o
-                                               46](BtlIOCmd_SlideHealthbarOut,func) found in local src_battle_battle_io_command.c.o
-                                                47](BattleDisplay_InitTaskSlideHealthbarOut,func) found in global src_battle_battle_display.c.o
-                                                 48](Healthbar_Scroll,func) found in global src_battle_healthbar.c.o
-                                                  49](ScrollHealthbarTask,func) found in local src_battle_healthbar.c.o
-                                                 48](Task_SlideHealthbarOut,func) found in local src_battle_battle_display.c.o
-                                               46](BtlIOCmd_SlideHealthbarIn,func) found in local src_battle_battle_io_command.c.o
-                                                47](BattleDisplay_InitTaskSlideHealthbarIn,func) found in global src_battle_battle_display.c.o
-                                                 48](Task_SlideHealthbarIn,func) found in local src_battle_battle_display.c.o
+                                               46](BtlIOCmd_SlideHealthBoxOut,func) found in local src_battle_battle_io_command.c.o
+                                                47](BattleDisplay_InitTaskSlideHealthBoxOut,func) found in global src_battle_battle_display.c.o
+                                                 48](HealthBox_Scroll,func) found in global src_battle_healthbox.c.o
+                                                  49](ScrollHealthBoxTask,func) found in local src_battle_healthbox.c.o
+                                                 48](Task_SlideHealthBoxOut,func) found in local src_battle_battle_display.c.o
+                                               46](BtlIOCmd_SlideHealthBoxIn,func) found in local src_battle_battle_io_command.c.o
+                                                47](BattleDisplay_InitTaskSlideHealthBoxIn,func) found in global src_battle_battle_display.c.o
+                                                 48](Task_SlideHealthBoxIn,func) found in local src_battle_battle_display.c.o
                                                46](BtlIOCmd_SlideTrainerIn,func) found in local src_battle_battle_io_command.c.o
                                                 47](BattleDisplay_InitTaskSlideTrainerIn,func) found in global src_battle_battle_display.c.o
                                                  48](BattleDisplay_NewManagedSpriteTrainer,func) found in local src_battle_battle_display.c.o
@@ -87362,7 +87362,7 @@
   0223F350 0000000C .text   BattleSystem_SetCommandIsEndWait	(src_battle_battle_system.c.o)
   0223F358 00000000 .text   $d	(src_battle_battle_system.c.o)
   0223F35C 00000000 .text   $t	(src_battle_battle_system.c.o)
-  0223F35C 00000010 .text   BattleSystem_GetHealthbar	(src_battle_battle_system.c.o)
+  0223F35C 00000010 .text   BattleSystem_GetHealthBox	(src_battle_battle_system.c.o)
   0223F368 00000000 .text   $d	(src_battle_battle_system.c.o)
   0223F36C 0000004E .text   ov16_0223F36C	(src_battle_battle_system.c.o)
   0223F36C 00000000 .text   $t	(src_battle_battle_system.c.o)
@@ -87548,13 +87548,13 @@
   022410DC 0000002C .text   BtlCmd_BackgroundSlideIn	(src_battle_battle_script.c.o)
   022410DC 00000000 .text   $t	(src_battle_battle_script.c.o)
   02241108 00000000 .text   $t	(src_battle_battle_script.c.o)
-  02241108 000000B8 .text   BtlCmd_HealthbarSlideIn	(src_battle_battle_script.c.o)
+  02241108 000000B8 .text   BtlCmd_HealthBoxSlideIn	(src_battle_battle_script.c.o)
   022411BC 00000000 .text   $d	(src_battle_battle_script.c.o)
   022411C0 00000000 .text   $t	(src_battle_battle_script.c.o)
-  022411C0 000000C8 .text   BtlCmd_HealthbarSlideInDelay	(src_battle_battle_script.c.o)
+  022411C0 000000C8 .text   BtlCmd_HealthBoxSlideInDelay	(src_battle_battle_script.c.o)
   02241280 00000000 .text   $d	(src_battle_battle_script.c.o)
   02241288 00000000 .text   $t	(src_battle_battle_script.c.o)
-  02241288 000000B8 .text   BtlCmd_HealthbarSlideOut	(src_battle_battle_script.c.o)
+  02241288 000000B8 .text   BtlCmd_HealthBoxSlideOut	(src_battle_battle_script.c.o)
   02241338 00000000 .text   $d	(src_battle_battle_script.c.o)
   02241340 00000000 .text   $t	(src_battle_battle_script.c.o)
   02241340 00000034 .text   BtlCmd_Wait	(src_battle_battle_script.c.o)
@@ -87691,7 +87691,7 @@
   022430F4 00000000 .text   $t	(src_battle_battle_script.c.o)
   02243120 0000002C .text   BtlCmd_UnlockMoveChoice	(src_battle_battle_script.c.o)
   02243120 00000000 .text   $t	(src_battle_battle_script.c.o)
-  0224314C 00000036 .text   BtlCmd_SetHealthbarStatus	(src_battle_battle_script.c.o)
+  0224314C 00000036 .text   BtlCmd_SetHealthBoxStatusIcon	(src_battle_battle_script.c.o)
   0224314C 00000000 .text   $t	(src_battle_battle_script.c.o)
   02243184 00000036 .text   BtlCmd_PrintTrainerMessage	(src_battle_battle_script.c.o)
   02243184 00000000 .text   $t	(src_battle_battle_script.c.o)
@@ -88859,9 +88859,9 @@
   0225C218 00000000 .text   $t	(src_battle_battle_io_command.c.o)
   0225C228 00000014 .text   BtlIOCmd_SlideTrainerIn	(src_battle_battle_io_command.c.o)
   0225C228 00000000 .text   $t	(src_battle_battle_io_command.c.o)
-  0225C23C 00000014 .text   BtlIOCmd_SlideHealthbarIn	(src_battle_battle_io_command.c.o)
+  0225C23C 00000014 .text   BtlIOCmd_SlideHealthBoxIn	(src_battle_battle_io_command.c.o)
   0225C23C 00000000 .text   $t	(src_battle_battle_io_command.c.o)
-  0225C250 00000010 .text   BtlIOCmd_SlideHealthbarOut	(src_battle_battle_io_command.c.o)
+  0225C250 00000010 .text   BtlIOCmd_SlideHealthBoxOut	(src_battle_battle_io_command.c.o)
   0225C250 00000000 .text   $t	(src_battle_battle_io_command.c.o)
   0225C260 00000026 .text   BtlIOCmd_SetCommandSelection	(src_battle_battle_io_command.c.o)
   0225C260 00000000 .text   $t	(src_battle_battle_io_command.c.o)
@@ -89006,10 +89006,10 @@
   0225D414 00000094 .text   BattleDisplay_InitTaskSlideTrainerIn	(src_battle_battle_display.c.o)
   0225D494 00000000 .text   $d	(src_battle_battle_display.c.o)
   0225D4A8 00000000 .text   $t	(src_battle_battle_display.c.o)
-  0225D4A8 000000C8 .text   BattleDisplay_InitTaskSlideHealthbarIn	(src_battle_battle_display.c.o)
+  0225D4A8 000000C8 .text   BattleDisplay_InitTaskSlideHealthBoxIn	(src_battle_battle_display.c.o)
   0225D568 00000000 .text   $d	(src_battle_battle_display.c.o)
   0225D570 00000000 .text   $t	(src_battle_battle_display.c.o)
-  0225D570 00000048 .text   BattleDisplay_InitTaskSlideHealthbarOut	(src_battle_battle_display.c.o)
+  0225D570 00000048 .text   BattleDisplay_InitTaskSlideHealthBoxOut	(src_battle_battle_display.c.o)
   0225D5B4 00000000 .text   $d	(src_battle_battle_display.c.o)
   0225D5B8 000000E0 .text   BattleDisplay_InitTaskSetCommandSelection	(src_battle_battle_display.c.o)
   0225D5B8 00000000 .text   $t	(src_battle_battle_display.c.o)
@@ -89155,9 +89155,9 @@
   02260374 00000000 .text   $d	(src_battle_battle_display.c.o)
   02260384 00000086 .text   Task_SlideTrainerIn	(src_battle_battle_display.c.o)
   02260384 00000000 .text   $t	(src_battle_battle_display.c.o)
-  0226040C 00000074 .text   Task_SlideHealthbarIn	(src_battle_battle_display.c.o)
+  0226040C 00000074 .text   Task_SlideHealthBoxIn	(src_battle_battle_display.c.o)
   0226040C 00000000 .text   $t	(src_battle_battle_display.c.o)
-  02260480 00000046 .text   Task_SlideHealthbarOut	(src_battle_battle_display.c.o)
+  02260480 00000046 .text   Task_SlideHealthBoxOut	(src_battle_battle_display.c.o)
   02260480 00000000 .text   $t	(src_battle_battle_display.c.o)
   022604C8 000005EC .text   Task_PlayerSetCommandSelection	(src_battle_battle_display.c.o)
   022604C8 00000000 .text   $t	(src_battle_battle_display.c.o)
@@ -89278,7 +89278,7 @@
   02263AF8 00000000 .text   $d	(src_battle_battle_display.c.o)
   02263AFC 0000000C .text   BattlerData_GetPokemonSprite	(src_battle_battle_display.c.o)
   02263AFC 00000000 .text   $t	(src_battle_battle_display.c.o)
-  02263B08 00000004 .text   BattlerData_GetHealthbar	(src_battle_battle_display.c.o)
+  02263B08 00000004 .text   BattlerData_GetHealthBox	(src_battle_battle_display.c.o)
   02263B08 00000000 .text   $t	(src_battle_battle_display.c.o)
   02263B0C 00000004 .text   ov16_02263B0C	(src_battle_battle_display.c.o)
   02263B0C 00000000 .text   $t	(src_battle_battle_display.c.o)
@@ -89373,9 +89373,9 @@
   022651A8 00000034 .text   BattleController_EmitSlideTrainerIn	(src_battle_battle_controller.c.o)
   022651A8 00000000 .text   $t	(src_battle_battle_controller.c.o)
   022651DC 00000000 .text   $t	(src_battle_battle_controller.c.o)
-  022651DC 00000138 .text   BattleController_EmitSlideHealthbarIn	(src_battle_battle_controller.c.o)
+  022651DC 00000138 .text   BattleController_EmitSlideHealthBoxIn	(src_battle_battle_controller.c.o)
   02265300 00000000 .text   $d	(src_battle_battle_controller.c.o)
-  02265314 0000001A .text   BattleController_EmitSlideHealthbarOut	(src_battle_battle_controller.c.o)
+  02265314 0000001A .text   BattleController_EmitSlideHealthBoxOut	(src_battle_battle_controller.c.o)
   02265314 00000000 .text   $t	(src_battle_battle_controller.c.o)
   02265330 000003A2 .text   BattleController_EmitSetCommandSelection	(src_battle_battle_controller.c.o)
   02265330 00000000 .text   $t	(src_battle_battle_controller.c.o)
@@ -89536,126 +89536,126 @@
   02266CF0 00000000 .text   $t	(src_battle_battle_controller.c.o)
   02266CF0 0000022C .text   PartyGaugeData_New	(src_battle_battle_controller.c.o)
   02266F14 00000000 .text   $d	(src_battle_battle_controller.c.o)
-  02266F1C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02266F1C 000000C8 .text   Healthbar_LoadResources	(src_battle_healthbar.c.o)
-  02266FD8 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02266FE4 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02266FE4 0000007C .text   Healthbar_LoadMainPalette	(src_battle_healthbar.c.o)
-  0226705C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267060 00000024 .text   Healthbar_DrawSprite	(src_battle_healthbar.c.o)
-  02267060 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267084 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267084 0000019C .text   Healthbar_DrawInfo	(src_battle_healthbar.c.o)
-  02267214 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267220 00000022 .text   ov16_02267220	(src_battle_healthbar.c.o)
-  02267220 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267244 00000014 .text   ov16_02267244	(src_battle_healthbar.c.o)
-  02267244 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267258 00000034 .text   ov16_02267258	(src_battle_healthbar.c.o)
-  02267258 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226728C 00000036 .text   ov16_0226728C	(src_battle_healthbar.c.o)
-  0226728C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022672C4 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022672C4 0000009C .text   ov16_022672C4	(src_battle_healthbar.c.o)
-  0226735C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267360 0000001C .text   ov16_02267360	(src_battle_healthbar.c.o)
-  02267360 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226737C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226737C 00000148 .text   ov16_0226737C	(src_battle_healthbar.c.o)
-  022674AC 00000000 .text   $d	(src_battle_healthbar.c.o)
-  022674C4 00000034 .text   Healthbar_CalcHP	(src_battle_healthbar.c.o)
-  022674C4 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022674F8 00000034 .text   ov16_022674F8	(src_battle_healthbar.c.o)
-  022674F8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226752C 00000034 .text   Healthbar_CalcExp	(src_battle_healthbar.c.o)
-  0226752C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267560 0000001C .text   ov16_02267560	(src_battle_healthbar.c.o)
-  02267560 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226757C 00000030 .text   ov16_0226757C	(src_battle_healthbar.c.o)
-  0226757C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022675AC 0000002C .text   ov16_022675AC	(src_battle_healthbar.c.o)
-  022675AC 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022675D8 0000001E .text   ov16_022675D8	(src_battle_healthbar.c.o)
-  022675D8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022675F8 00000028 .text   Healthbar_EnableArrow	(src_battle_healthbar.c.o)
-  022675F8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267620 0000001A .text   Healthbar_Enable	(src_battle_healthbar.c.o)
-  02267620 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226763C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226763C 0000006C .text   Healthbar_OffsetPositionXY	(src_battle_healthbar.c.o)
-  022676A4 00000000 .text   $d	(src_battle_healthbar.c.o)
-  022676A8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022676A8 000000A4 .text   Healthbar_Scroll	(src_battle_healthbar.c.o)
-  02267744 00000000 .text   $d	(src_battle_healthbar.c.o)
-  0226774C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226774C 00000118 .text   ScrollHealthbarTask	(src_battle_healthbar.c.o)
-  02267860 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267864 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267864 00000164 .text   Healthbar_DrawBattlerName	(src_battle_healthbar.c.o)
-  022679A4 00000000 .text   $d	(src_battle_healthbar.c.o)
-  022679C8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022679C8 00000084 .text   Healthbar_DrawLevelText	(src_battle_healthbar.c.o)
-  02267A3C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267A4C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267A4C 00000120 .text   Healthbar_DrawLevelNumber	(src_battle_healthbar.c.o)
-  02267B5C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267B6C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267B6C 0000008C .text   Healthbar_DrawCurrentHP	(src_battle_healthbar.c.o)
-  02267BE8 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267BF8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267BF8 00000060 .text   Healthbar_DrawMaxHP	(src_battle_healthbar.c.o)
-  02267C50 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267C58 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267C58 00000050 .text   Healthbar_DrawCaughtIcon	(src_battle_healthbar.c.o)
-  02267CA0 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267CA8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267CA8 00000040 .text   Healthbar_DrawStatusIcon	(src_battle_healthbar.c.o)
-  02267CE0 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267CE8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267CE8 000000DC .text   Healthbar_DrawBallCount	(src_battle_healthbar.c.o)
-  02267DC0 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267DC4 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267DC4 00000118 .text   Healthbar_DrawBallsLeftMessage	(src_battle_healthbar.c.o)
-  02267ED8 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02267EDC 00000094 .text   Healthbar_DrawGauge	(src_battle_healthbar.c.o)
-  02267EDC 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267F70 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02267F70 00000168 .text   DrawGauge	(src_battle_healthbar.c.o)
-  022680D0 00000000 .text   $d	(src_battle_healthbar.c.o)
-  022680D8 000000BC .text   UpdateGauge	(src_battle_healthbar.c.o)
-  022680D8 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268194 0000007A .text   FillCells	(src_battle_healthbar.c.o)
-  02268194 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268210 0000003E .text   CalcGaugeFill	(src_battle_healthbar.c.o)
-  02268210 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268250 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268250 0000000C .text   GetHealthbarPartsTile	(src_battle_healthbar.c.o)
-  02268258 00000000 .text   $d	(src_battle_healthbar.c.o)
-  0226825C 00000054 .text   Healthbar_Type	(src_battle_healthbar.c.o)
-  0226825C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022682B0 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022682B0 00000064 .text   Healthbar_SpriteTemplate	(src_battle_healthbar.c.o)
-  022682F8 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02268314 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268314 00000038 .text   ov16_02268314	(src_battle_healthbar.c.o)
-  02268348 00000000 .text   $d	(src_battle_healthbar.c.o)
-  0226834C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226834C 00000034 .text   ov16_0226834C	(src_battle_healthbar.c.o)
-  0226837C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02268380 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268380 000000E8 .text   ov16_02268380	(src_battle_healthbar.c.o)
-  0226845C 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02268468 00000002 .text   ov16_02268468	(src_battle_healthbar.c.o)
-  02268468 00000000 .text   $t	(src_battle_healthbar.c.o)
-  0226846C 00000002 .text   ov16_0226846C	(src_battle_healthbar.c.o)
-  0226846C 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268470 00000000 .text   $t	(src_battle_healthbar.c.o)
-  02268470 00000028 .text   ov16_02268470	(src_battle_healthbar.c.o)
-  02268490 00000000 .text   $d	(src_battle_healthbar.c.o)
-  02268498 00000024 .text   ov16_02268498	(src_battle_healthbar.c.o)
-  02268498 00000000 .text   $t	(src_battle_healthbar.c.o)
-  022684BC 00000062 .text   ov16_022684BC	(src_battle_healthbar.c.o)
-  022684BC 00000000 .text   $t	(src_battle_healthbar.c.o)
+  02266F1C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02266F1C 000000C8 .text   HealthBox_LoadResources	(src_battle_healthbox.c.o)
+  02266FD8 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02266FE4 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02266FE4 0000007C .text   HealthBox_LoadMainPalette	(src_battle_healthbox.c.o)
+  0226705C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267060 00000024 .text   HealthBox_DrawSprite	(src_battle_healthbox.c.o)
+  02267060 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267084 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267084 0000019C .text   HealthBox_DrawInfo	(src_battle_healthbox.c.o)
+  02267214 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267220 00000022 .text   ov16_02267220	(src_battle_healthbox.c.o)
+  02267220 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267244 00000014 .text   ov16_02267244	(src_battle_healthbox.c.o)
+  02267244 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267258 00000034 .text   ov16_02267258	(src_battle_healthbox.c.o)
+  02267258 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226728C 00000036 .text   ov16_0226728C	(src_battle_healthbox.c.o)
+  0226728C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022672C4 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022672C4 0000009C .text   ov16_022672C4	(src_battle_healthbox.c.o)
+  0226735C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267360 0000001C .text   ov16_02267360	(src_battle_healthbox.c.o)
+  02267360 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226737C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226737C 00000148 .text   ov16_0226737C	(src_battle_healthbox.c.o)
+  022674AC 00000000 .text   $d	(src_battle_healthbox.c.o)
+  022674C4 00000034 .text   HealthBox_CalcHP	(src_battle_healthbox.c.o)
+  022674C4 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022674F8 00000034 .text   ov16_022674F8	(src_battle_healthbox.c.o)
+  022674F8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226752C 00000034 .text   HealthBox_CalcExp	(src_battle_healthbox.c.o)
+  0226752C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267560 0000001C .text   ov16_02267560	(src_battle_healthbox.c.o)
+  02267560 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226757C 00000030 .text   ov16_0226757C	(src_battle_healthbox.c.o)
+  0226757C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022675AC 0000002C .text   ov16_022675AC	(src_battle_healthbox.c.o)
+  022675AC 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022675D8 0000001E .text   ov16_022675D8	(src_battle_healthbox.c.o)
+  022675D8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022675F8 00000028 .text   HealthBox_EnableArrow	(src_battle_healthbox.c.o)
+  022675F8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267620 0000001A .text   HealthBox_Enable	(src_battle_healthbox.c.o)
+  02267620 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226763C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226763C 0000006C .text   HealthBox_OffsetPositionXY	(src_battle_healthbox.c.o)
+  022676A4 00000000 .text   $d	(src_battle_healthbox.c.o)
+  022676A8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022676A8 000000A4 .text   HealthBox_Scroll	(src_battle_healthbox.c.o)
+  02267744 00000000 .text   $d	(src_battle_healthbox.c.o)
+  0226774C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226774C 00000118 .text   ScrollHealthBoxTask	(src_battle_healthbox.c.o)
+  02267860 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267864 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267864 00000164 .text   HealthBox_DrawBattlerName	(src_battle_healthbox.c.o)
+  022679A4 00000000 .text   $d	(src_battle_healthbox.c.o)
+  022679C8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022679C8 00000084 .text   HealthBox_DrawLevelText	(src_battle_healthbox.c.o)
+  02267A3C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267A4C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267A4C 00000120 .text   HealthBox_DrawLevelNumber	(src_battle_healthbox.c.o)
+  02267B5C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267B6C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267B6C 0000008C .text   HealthBox_DrawCurrentHP	(src_battle_healthbox.c.o)
+  02267BE8 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267BF8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267BF8 00000060 .text   HealthBox_DrawMaxHP	(src_battle_healthbox.c.o)
+  02267C50 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267C58 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267C58 00000050 .text   HealthBox_DrawCaughtIcon	(src_battle_healthbox.c.o)
+  02267CA0 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267CA8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267CA8 00000040 .text   HealthBox_DrawStatusIcon	(src_battle_healthbox.c.o)
+  02267CE0 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267CE8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267CE8 000000DC .text   HealthBox_DrawBallCount	(src_battle_healthbox.c.o)
+  02267DC0 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267DC4 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267DC4 00000118 .text   HealthBox_DrawBallsLeftMessage	(src_battle_healthbox.c.o)
+  02267ED8 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02267EDC 00000094 .text   HealthBox_DrawGauge	(src_battle_healthbox.c.o)
+  02267EDC 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267F70 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02267F70 00000168 .text   DrawGauge	(src_battle_healthbox.c.o)
+  022680D0 00000000 .text   $d	(src_battle_healthbox.c.o)
+  022680D8 000000BC .text   UpdateGauge	(src_battle_healthbox.c.o)
+  022680D8 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268194 0000007A .text   FillCells	(src_battle_healthbox.c.o)
+  02268194 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268210 0000003E .text   CalcGaugeFill	(src_battle_healthbox.c.o)
+  02268210 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268250 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268250 0000000C .text   GetHealthBoxPartsTile	(src_battle_healthbox.c.o)
+  02268258 00000000 .text   $d	(src_battle_healthbox.c.o)
+  0226825C 00000054 .text   HealthBox_Type	(src_battle_healthbox.c.o)
+  0226825C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022682B0 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022682B0 00000064 .text   HealthBox_SpriteTemplate	(src_battle_healthbox.c.o)
+  022682F8 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02268314 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268314 00000038 .text   ov16_02268314	(src_battle_healthbox.c.o)
+  02268348 00000000 .text   $d	(src_battle_healthbox.c.o)
+  0226834C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226834C 00000034 .text   ov16_0226834C	(src_battle_healthbox.c.o)
+  0226837C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02268380 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268380 000000E8 .text   ov16_02268380	(src_battle_healthbox.c.o)
+  0226845C 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02268468 00000002 .text   ov16_02268468	(src_battle_healthbox.c.o)
+  02268468 00000000 .text   $t	(src_battle_healthbox.c.o)
+  0226846C 00000002 .text   ov16_0226846C	(src_battle_healthbox.c.o)
+  0226846C 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268470 00000000 .text   $t	(src_battle_healthbox.c.o)
+  02268470 00000028 .text   ov16_02268470	(src_battle_healthbox.c.o)
+  02268490 00000000 .text   $d	(src_battle_healthbox.c.o)
+  02268498 00000024 .text   ov16_02268498	(src_battle_healthbox.c.o)
+  02268498 00000000 .text   $t	(src_battle_healthbox.c.o)
+  022684BC 00000062 .text   ov16_022684BC	(src_battle_healthbox.c.o)
+  022684BC 00000000 .text   $t	(src_battle_healthbox.c.o)
   02268520 00000000 .text   $t	(src_battle_ov16_02268520.c.o)
   02268520 0000010C .text   ov16_02268520	(src_battle_ov16_02268520.c.o)
   02268614 00000000 .text   $d	(src_battle_ov16_02268520.c.o)
@@ -90141,30 +90141,30 @@
   0226F1D0 0000005C .rodata sFadeTargets	(src_battle_battle_display.c.o)
   0226F22C 000000F0 .rodata @18334	(src_battle_battle_display.c.o)
   0226F31C 00000018 .rodata Unk_ov16_0226F31C	(src_battle_battle_display.c.o)
-  0226F334 00000006 .rodata sArrowOffsetX	(src_battle_healthbar.c.o)
-  0226F33C 00000010 .rodata Unk_ov16_0226F33C	(src_battle_healthbar.c.o)
-  0226F33C 00000000 .rodata .rodata	(src_battle_healthbar.c.o)
-  0226F34C 00000010 .rodata Unk_ov16_0226F34C	(src_battle_healthbar.c.o)
-  0226F35C 00000018 .rodata Unk_ov16_0226F35C	(src_battle_healthbar.c.o)
-  0226F374 00000018 .rodata Unk_ov16_0226F374	(src_battle_healthbar.c.o)
-  0226F38C 00000018 .rodata Unk_ov16_0226F38C	(src_battle_healthbar.c.o)
-  0226F3A4 00000018 .rodata Unk_ov16_0226F3A4	(src_battle_healthbar.c.o)
-  0226F3BC 00000018 .rodata Unk_ov16_0226F3BC	(src_battle_healthbar.c.o)
-  0226F3D4 00000018 .rodata Unk_ov16_0226F3D4	(src_battle_healthbar.c.o)
-  0226F3EC 00000030 .rodata Unk_ov16_0226F3EC	(src_battle_healthbar.c.o)
-  0226F41C 00000030 .rodata Unk_ov16_0226F41C	(src_battle_healthbar.c.o)
-  0226F44C 00000030 .rodata Unk_ov16_0226F44C	(src_battle_healthbar.c.o)
-  0226F47C 00000030 .rodata Unk_ov16_0226F47C	(src_battle_healthbar.c.o)
-  0226F4AC 00000034 .rodata sHealthbarTemplate_PlayerSlot1	(src_battle_healthbar.c.o)
-  0226F4E0 00000034 .rodata sHealthbarTemplate_EnemySlot1	(src_battle_healthbar.c.o)
-  0226F514 00000034 .rodata sHealthbarTemplate_Unk_ov16_0226F514	(src_battle_healthbar.c.o)
-  0226F548 00000034 .rodata sHealthbarTemplate_PlayerSlot2	(src_battle_healthbar.c.o)
-  0226F57C 00000034 .rodata sHealthbarTemplate_NoPlayerMon	(src_battle_healthbar.c.o)
-  0226F5B0 00000034 .rodata sHealthbarTemplate_SoloPlayer	(src_battle_healthbar.c.o)
-  0226F5E4 00000034 .rodata sHealthbarTemplate_SoloEnemy	(src_battle_healthbar.c.o)
-  0226F618 00000034 .rodata sHealthbarTemplate_EnemySlot2	(src_battle_healthbar.c.o)
-  0226F64C 00000060 .rodata sBattlerNameVRAMTransfer	(src_battle_healthbar.c.o)
-  0226F6AC 000009C0 .rodata sHealthbarPartsBitmap	(src_battle_healthbar.c.o)
+  0226F334 00000006 .rodata sArrowOffsetX	(src_battle_healthbox.c.o)
+  0226F33C 00000010 .rodata Unk_ov16_0226F33C	(src_battle_healthbox.c.o)
+  0226F33C 00000000 .rodata .rodata	(src_battle_healthbox.c.o)
+  0226F34C 00000010 .rodata Unk_ov16_0226F34C	(src_battle_healthbox.c.o)
+  0226F35C 00000018 .rodata Unk_ov16_0226F35C	(src_battle_healthbox.c.o)
+  0226F374 00000018 .rodata Unk_ov16_0226F374	(src_battle_healthbox.c.o)
+  0226F38C 00000018 .rodata Unk_ov16_0226F38C	(src_battle_healthbox.c.o)
+  0226F3A4 00000018 .rodata Unk_ov16_0226F3A4	(src_battle_healthbox.c.o)
+  0226F3BC 00000018 .rodata Unk_ov16_0226F3BC	(src_battle_healthbox.c.o)
+  0226F3D4 00000018 .rodata Unk_ov16_0226F3D4	(src_battle_healthbox.c.o)
+  0226F3EC 00000030 .rodata Unk_ov16_0226F3EC	(src_battle_healthbox.c.o)
+  0226F41C 00000030 .rodata Unk_ov16_0226F41C	(src_battle_healthbox.c.o)
+  0226F44C 00000030 .rodata Unk_ov16_0226F44C	(src_battle_healthbox.c.o)
+  0226F47C 00000030 .rodata Unk_ov16_0226F47C	(src_battle_healthbox.c.o)
+  0226F4AC 00000034 .rodata sHealthBoxTemplate_PlayerSlot1	(src_battle_healthbox.c.o)
+  0226F4E0 00000034 .rodata sHealthBoxTemplate_EnemySlot1	(src_battle_healthbox.c.o)
+  0226F514 00000034 .rodata sHealthBoxTemplate_Unk_ov16_0226F514	(src_battle_healthbox.c.o)
+  0226F548 00000034 .rodata sHealthBoxTemplate_PlayerSlot2	(src_battle_healthbox.c.o)
+  0226F57C 00000034 .rodata sHealthBoxTemplate_NoPlayerMon	(src_battle_healthbox.c.o)
+  0226F5B0 00000034 .rodata sHealthBoxTemplate_SoloPlayer	(src_battle_healthbox.c.o)
+  0226F5E4 00000034 .rodata sHealthBoxTemplate_SoloEnemy	(src_battle_healthbox.c.o)
+  0226F618 00000034 .rodata sHealthBoxTemplate_EnemySlot2	(src_battle_healthbox.c.o)
+  0226F64C 00000060 .rodata sBattlerNameVRAMTransfer	(src_battle_healthbox.c.o)
+  0226F6AC 000009C0 .rodata sHealthBoxPartsBitmap	(src_battle_healthbox.c.o)
   0227006C 00000000 .rodata .rodata	(src_battle_ov16_02268520.c.o)
   0227006C 00000030 .rodata sTerrainSpriteSource_EnemySide	(src_battle_ov16_02268520.c.o)
   0227009C 00000030 .rodata sTerrainSpriteSource_PlayerSide	(src_battle_ov16_02268520.c.o)