Merge branch 'master' into slot_machine

src/fieldmap.c

@@ -1022,4 +1022,4 @@ void apply_map_tileset1_tileset2_palette(struct MapData const *mapData)
         apply_map_tileset1_palette(mapData);
         apply_map_tileset2_palette(mapData);
     }
-}
+}

src/mystery_event_msg.c

@@ -10,4 +10,4 @@ const u8 gText_MysteryGiftSentOver[] = _("{STR_VAR_1} was sent over!");
 const u8 gText_MysteryGiftFullParty[] = _("Your party is full.\n{STR_VAR_1} could not be sent over.");
 const u8 gText_MysteryGiftNewTrainer[] = _("A new TRAINER has arrived in\nHOENN.");
 const u8 gText_MysteryGiftNewAdversaryInBattleTower[] = _("バトルタワーに　あらたな\nたいせんしゃが　あらわれた！");
-const u8 gText_MysteryGiftCantBeUsed[] = _("This data can’t be used in\nthis version.");
+const u8 gText_MysteryGiftCantBeUsed[] = _("This data can't be used in\nthis version.");