diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-08 12:55:16 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-08 12:55:16 -0400 |
| commit | 5d7c0e9bb041ec4c7d8fd3c88c02ac1f25e200a7 (patch) | |
| tree | 798a03559ad23c44e505f068ee38ec8e82ae2419 | |
| parent | 42c00ee3f3f4083d193aacacff19e1bfc0bf2ac3 (diff) | |
Remove duplicate decl; use EASY_CHAT_TYPE define in mystery_event_club.inc
| -rw-r--r-- | data/scripts/mystery_event_club.inc | 2 | ||||
| -rw-r--r-- | include/easy_chat.h | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index 8034ee0b1..5c4432714 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -100,7 +100,7 @@ EventScript_GaveSpecialProfile: @ 81BEF3F end EventScript_GiveProfile: @ 81BEF5A - setvar VAR_0x8004, 0 + setvar VAR_0x8004, EASY_CHAT_TYPE_PROFILE call Common_ShowEasyChatScreen lock faceplayer diff --git a/include/easy_chat.h b/include/easy_chat.h index e04db7b35..11711cbbc 100644 --- a/include/easy_chat.h +++ b/include/easy_chat.h @@ -30,7 +30,6 @@ struct EasyChatWordsByLetter int numWords; }; -void InitEasyChatPhrases(void); u8 *CopyEasyChatWord(u8 *dest, u16 word); u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2); bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength); |