diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 15:42:40 -0800 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 16:06:44 -0800 |
commit | 267ada5ce6e2876c4df64275da9ee879a385c6f6 (patch) | |
tree | 559417726bbd5f3b18c153c1435f872decfe18b1 /include/mail_data.h | |
parent | 20d00c58ef49fa88533fa07ab1801c381f02b7bf (diff) | |
parent | 67ad331441f29545b84d152cbbb4f188098a9c5a (diff) |
Merge remote-tracking branch 'upstream/master' into 80c
Diffstat (limited to 'include/mail_data.h')
-rw-r--r-- | include/mail_data.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/mail_data.h b/include/mail_data.h index df4b385a1..2659c0d37 100644 --- a/include/mail_data.h +++ b/include/mail_data.h @@ -11,6 +11,6 @@ u8 GiveMailToMon2(struct Pokemon *, struct MailStruct *); void TakeMailFromMon(struct Pokemon *); u8 TakeMailFromMon2(struct Pokemon *); bool8 ItemIsMail(u16); -bool8 ItemIsMail(u16); +bool8 MonHasMail(struct Pokemon *); #endif // GUARD_MAIL_DATA_H |