diff --git a/src/event_object_movement.c b/src/event_object_movement.c
index 8f6b5ffaf..1ec5043ae 100755
--- a/src/event_object_movement.c
+++ b/src/event_object_movement.c
@@ -1808,7 +1808,7 @@ static u16 PackGraphicsId(const struct ObjectEventTemplate *template) {
         if (template->script && template->script[0] == 0x7d) {
             form = T1_READ_16(&template->script[2]);
             form = (form >> 10) & 0x1F;
-        } else if (template->trainerRange_berryTreeId) {
+        } else if (template->trainerRange_berryTreeId && !template->trainerType) {
             form = template->trainerRange_berryTreeId & 0x1F;
         }
         graphicsId |= form << OBJ_EVENT_GFX_SPECIES_BITS;
diff --git a/src/follower_helper.c b/src/follower_helper.c
index e9b6b1237..a7a1f38ca 100755
--- a/src/follower_helper.c
+++ b/src/follower_helper.c
@@ -36,7 +36,7 @@ static const u8 sCondMsg16[] = _("{STR_VAR_1} doesn't want to get off\nthe boat
 static const u8* const sBoatTexts[] = {sCondMsg14, sCondMsg15, sCondMsg16, NULL};
 static const u8 sCondMsg17[] = _("{STR_VAR_1} is listening to the\nsound of the machines.");
 static const u8* const sMachineTexts[] = {sCondMsg13, sCondMsg17, NULL};
-static const u8 sCondMsg18[] = _("Waah! your POKéMON suddenly splashed\nwater!");
+static const u8 sCondMsg18[] = _("Waah! Your POKéMON suddenly splashed\nwater!");
 static const u8 sCondMsg19[] = _("Your POKéMON is blowing sand in the\nair!");
 static const u8 sCondMsg20[] = _("{STR_VAR_1} is playing around,\nplucking bits of grass.");
 static const u8 sCondMsg21[] = _("Your POKéMON is happily looking at\nyour footprints!");
diff --git a/tools/mapjson/json11.cpp b/tools/mapjson/json11.cpp
index 1da530206..1b818d09c 100755
--- a/tools/mapjson/json11.cpp
+++ b/tools/mapjson/json11.cpp
@@ -20,6 +20,7 @@
 #include "json11.h"
 #include <cassert>
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
 #include <cstdio>
 #include <limits>