diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-16 13:53:55 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-16 13:53:55 -0500 |
| commit | 6546ff5d0ad80ceca6b422713e0d3cd0ffa62b53 (patch) | |
| tree | 51320be5ec4fb0755398911d705f6e3f323ddf0a /src/strings.c | |
| parent | 196f2a1c24016eae8b9fad6d57cabd43d34f898e (diff) | |
| parent | e50b9e28bc0d98c69b22f6d13298e705eb4eb865 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/strings.c')
| -rw-r--r-- | src/strings.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/strings.c b/src/strings.c index cc0641dce..219c5bec1 100644 --- a/src/strings.c +++ b/src/strings.c @@ -197,7 +197,7 @@ const u8 OtherText_TheField[] = _("the field."); const u8 OtherText_TheField2[] = _("the field."); const u8 OtherText_ThePC[] = _("the PC."); -const struct TextStruct gUnknown_0840E740[7] = +const u8 *const gUnknown_0840E740[7] = { OtherText_TheField3, OtherText_TheBattle, @@ -976,7 +976,7 @@ const u8 gBirchText_Girl[] = _("MÄDEL"); const u8 gBirchText_NewName[] = _("NEUER NAME"); #ifdef SAPPHIRE -const u8 gDefaultBoyName1[] = _("SEAN"); +const u8 gDefaultBoyName1[] = _("SEBOLD"); #else const u8 gDefaultBoyName1[] = _("ROLAND"); #endif @@ -985,7 +985,7 @@ const u8 gDefaultBoyName3[] = _("HELGE"); const u8 gDefaultBoyName4[] = _("JAN"); #ifdef SAPPHIRE -const u8 gDefaultGirlName1[] = _("MARINA"); +const u8 gDefaultGirlName1[] = _("MARTINA"); #else const u8 gDefaultGirlName1[] = _("PETRA"); #endif @@ -1120,7 +1120,7 @@ const u8 OtherText_TheField[] = _("zum Hauptmenü."); const u8 OtherText_TheField2[] = _("zum Hauptmenü."); const u8 OtherText_ThePC[] = _("zum PC."); -const struct TextStruct gUnknown_0840E740[7] = +const u8 *const gUnknown_0840E740[7] = { OtherText_TheField3, OtherText_TheBattle, |