Merge remote-tracking branch 'upstream/master' into shop

# Conflicts:
#	asm/shop.s

1 files changed, 10 insertions, 10 deletions

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 278edb6f4..d2750bf9d 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -974,13 +974,13 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId)
 
     gSprites[healthboxLeftSpriteId].hMain_HealthBarSpriteId = healthbarSpriteId;
     gSprites[healthboxLeftSpriteId].hMain_Battler = battlerId;
-    gSprites[healthboxLeftSpriteId].invisible = 1;
+    gSprites[healthboxLeftSpriteId].invisible = TRUE;
 
-    gSprites[healthboxRightSpriteId].invisible = 1;
+    gSprites[healthboxRightSpriteId].invisible = TRUE;
 
     healthBarSpritePtr->hBar_HealthBoxSpriteId = healthboxLeftSpriteId;
     healthBarSpritePtr->hBar_Data6 = data6;
-    healthBarSpritePtr->invisible = 1;
+    healthBarSpritePtr->invisible = TRUE;
 
     return healthboxLeftSpriteId;
 }
@@ -1058,16 +1058,16 @@ void SetBattleBarStruct(u8 battlerId, u8 healthboxSpriteId, s32 maxVal, s32 oldV
 
 void SetHealthboxSpriteInvisible(u8 healthboxSpriteId)
 {
-    gSprites[healthboxSpriteId].invisible = 1;
-    gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 1;
-    gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 1;
+    gSprites[healthboxSpriteId].invisible = TRUE;
+    gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = TRUE;
+    gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = TRUE;
 }
 
 void SetHealthboxSpriteVisible(u8 healthboxSpriteId)
 {
-    gSprites[healthboxSpriteId].invisible = 0;
-    gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = 0;
-    gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = 0;
+    gSprites[healthboxSpriteId].invisible = FALSE;
+    gSprites[gSprites[healthboxSpriteId].hMain_HealthBarSpriteId].invisible = FALSE;
+    gSprites[gSprites[healthboxSpriteId].oam.affineParam].invisible = FALSE;
 }
 
 static void UpdateSpritePos(u8 spriteId, s16 x, s16 y)
@@ -2589,7 +2589,7 @@ static u8* AddTextPrinterAndCreateWindowOnHealthbox(const u8 *str, u32 x, u32 y,
     color[1] = 1;
     color[2] = 3;
 
-    AddTextPrinterParameterized2(winId, 0, x, y, 0, 0, color, -1, str);
+    AddTextPrinterParameterized4(winId, 0, x, y, 0, 0, color, -1, str);
 
     *windowId = winId;
     return (u8*)(GetWindowAttribute(winId, WINDOW_TILE_DATA));