diff --git a/include/battle_tower.h b/include/battle_tower.h
index 074fccf3a5..45c9d683ff 100644
--- a/include/battle_tower.h
+++ b/include/battle_tower.h
@@ -27,9 +27,9 @@ struct BattleFrontierTrainer
 };
 
 extern const u8 gTowerMaleFacilityClasses[30];
-extern const u8 gTowerMaleTrainerGfxIds[30];
+extern const u16 gTowerMaleTrainerGfxIds[30];
 extern const u8 gTowerFemaleFacilityClasses[20];
-extern const u8 gTowerFemaleTrainerGfxIds[20];
+extern const u16 gTowerFemaleTrainerGfxIds[20];
 extern const struct TrainerMon gBattleFrontierMons[];
 extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
 extern const struct TrainerMon gSlateportBattleTentMons[];
diff --git a/src/battle_tower.c b/src/battle_tower.c
index 045f87ad65..51200512f1 100644
--- a/src/battle_tower.c
+++ b/src/battle_tower.c
@@ -143,7 +143,7 @@ const u8 gTowerFemaleFacilityClasses[20] =
     FACILITY_CLASS_LASS
 };
 
-const u8 gTowerMaleTrainerGfxIds[30] =
+const u16 gTowerMaleTrainerGfxIds[30] =
 {
     OBJ_EVENT_GFX_HIKER,
     OBJ_EVENT_GFX_TUBER_M,
@@ -177,7 +177,7 @@ const u8 gTowerMaleTrainerGfxIds[30] =
     OBJ_EVENT_GFX_HIKER
 };
 
-const u8 gTowerFemaleTrainerGfxIds[20] =
+const u16 gTowerFemaleTrainerGfxIds[20] =
 {
     OBJ_EVENT_GFX_WOMAN_2,
     OBJ_EVENT_GFX_TUBER_F,
@@ -3524,7 +3524,7 @@ static void FillTentTrainerParty_(u16 trainerId, u8 firstMonId, u8 monCount)
 
 u16 FacilityClassToGraphicsId(u8 facilityClass)
 {
-    u8 trainerObjectGfxId;
+    u16 trainerObjectGfxId;
     u8 i;
 
     // Search male classes.
diff --git a/src/data/text/follower_messages.h b/src/data/text/follower_messages.h
index 7678992f22..638df64d88 100644
--- a/src/data/text/follower_messages.h
+++ b/src/data/text/follower_messages.h
@@ -34,7 +34,7 @@ static const u8 sHappyMsg11[] = _("Your POKéMON has caught the scent of\nsmoke.
 static const u8 sHappyMsg12[] = _("{STR_VAR_1} is poking at your belly.");
 static const u8 sHappyMsg13[] = _("Your POKéMON stretched out its body\nand is relaxing.");
 static const u8 sHappyMsg14[] = _("{STR_VAR_1} looks like it wants to\nlead!");
-static const u8 sHappyMsg15[] = _("{STR_VAR_1} is doing it's best to\nkeep up with you.");
+static const u8 sHappyMsg15[] = _("{STR_VAR_1} is doing its best to\nkeep up with you.");
 static const u8 sHappyMsg16[] = _("{STR_VAR_1} is happily cuddling up\nto you!");
 static const u8 sHappyMsg17[] = _("{STR_VAR_1} is full of life!");
 static const u8 sHappyMsg18[] = _("{STR_VAR_1} seems to be very happy!");
@@ -134,7 +134,7 @@ const struct FollowerMsgInfo gFollowerUpsetMessages[] = {
 
 // Unconditional angry messages
 static const u8 sAngryMsg00[] = _("{STR_VAR_1} let out a roar!");
-static const u8 sAngryMsg01[] = _("{STR_VAR_1} is making a face like\nits angry!");
+static const u8 sAngryMsg01[] = _("{STR_VAR_1} is making a face like\nit's angry!");
 static const u8 sAngryMsg02[] = _("{STR_VAR_1} seems to be angry for\nsome reason.");
 static const u8 sAngryMsg03[] = _("Your POKéMON turned to face the\nother way, showing a defiant face.");
 static const u8 sAngryMsg04[] = _("{STR_VAR_1} cried out.");
diff --git a/src/follower_helper.c b/src/follower_helper.c
index 24de61a3fd..02b39902eb 100644
--- a/src/follower_helper.c
+++ b/src/follower_helper.c
@@ -55,7 +55,7 @@ static const u8* const sFearTexts[] = {sCondMsg29, sCondMsg30, NULL};
 static const u8 sCondMsg31[] = _("{STR_VAR_1} is taking shelter in the\ngrass from the rain.");
 static const u8 sCondMsg32[] = _("{STR_VAR_1} seems very cold.");
 static const u8 sCondMsg33[] = _("{STR_VAR_1} is staring at the sea.");
-static const u8 sCondMsg34[] = _("Your pokemon is staring intently at\nthe sea!");
+static const u8 sCondMsg34[] = _("Your POKéMON is staring intently at\nthe sea!");
 static const u8 sCondMsg35[] = _("{STR_VAR_1} is looking at the\nsurging sea.");
 static const u8* const sSeaTexts[] = {sCondMsg33, sCondMsg34, sCondMsg35, NULL};
 static const u8 sCondMsg36[] = _("{STR_VAR_1} is listening to the\nsound of the waterfall.");