diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-22 21:40:32 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-05-22 21:40:32 -0400 |
| commit | 8502697ecd1f3b21c4ac457b3b75896af984daa5 (patch) | |
| tree | 47e9e2a9948190905313b962188290d1c0b2ad44 /src | |
| parent | 3ce8764b195ab3137b5ee96da7b3c1bede5a0c51 (diff) | |
| parent | 337c8177212e12d4a4ad2eee4324ae3d09a21e99 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src')
| -rw-r--r-- | src/fieldmap.c | 2 | ||||
| -rw-r--r-- | src/mystery_event_msg.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/fieldmap.c b/src/fieldmap.c index be5e1d54a..5d11c7d99 100644 --- a/src/fieldmap.c +++ b/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); } -}
\ No newline at end of file +} diff --git a/src/mystery_event_msg.c b/src/mystery_event_msg.c index a21750b7a..7cde2d9f2 100644 --- a/src/mystery_event_msg.c +++ b/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."); |