summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--include/menu_cursor.h4
-rw-r--r--include/strings2.h4
-rw-r--r--src/trade.c3
3 files changed, 10 insertions, 1 deletions
diff --git a/include/menu_cursor.h b/include/menu_cursor.h
index ca82ef244..6d31cc29f 100644
--- a/include/menu_cursor.h
+++ b/include/menu_cursor.h
@@ -21,4 +21,8 @@ void sub_814AD7C(u8 a1, u8 a2);
void sub_814ADC8(void);
void sub_814ADF4(u8 a1);
+#if GERMAN
+extern const u32 gUnknown_0842F798[2];
+#endif
+
#endif // GUARD_MENU_CURSOR_H
diff --git a/include/strings2.h b/include/strings2.h
index 600bb2d31..8052c6c4a 100644
--- a/include/strings2.h
+++ b/include/strings2.h
@@ -319,4 +319,8 @@ extern const u8 gOtherText_OK[];
// wallclock
extern const u8 gOtherText_CorrectTimePrompt[];
+#if GERMAN
+extern const u8 deuOtherText_ForgotAndLearned[];
+#endif
+
#endif // GUARD_STRINGS2_H
diff --git a/src/trade.c b/src/trade.c
index ad770fd76..42c4afe07 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -219,6 +219,7 @@ static
#endif
u8 sub_804A2B4(u8 *, u8, u8);
static void sub_804A96C_alt(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
+static void sub_804A96C(struct UnkStructD *, u8, u8, const u16 *, u8, u8, u16);
#ifdef NONMATCHING
static
#endif
@@ -5450,7 +5451,7 @@ static void sub_804DAD4(struct MailStruct *mail, const struct InGameTrade *trade
StringCopy(mail->playerName, trade->otName);
#if GERMAN
- PadNameString(mail->string, CHAR_SPACE);
+ PadNameString(mail->playerName, CHAR_SPACE);
#endif
mail->trainerId[0] = trade->otId >> 24;