diff options
| author | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2019-03-24 20:08:49 -0400 |
| commit | 708f128568816f2c1efc14c5565a32240f83f171 (patch) | |
| tree | 62e58d7344f8c1ac83a21a86dc3c27d5867edbc0 /src/easy_chat.c | |
| parent | 2136187c113be3c1bc0627c23915f88e0c8a6fc7 (diff) | |
| parent | d7a9fcb9755cd06e4e0245b848e44f4ff75e22cb (diff) | |
Merge branch 'master' into dodrio_berry_picking
Diffstat (limited to 'src/easy_chat.c')
| -rw-r--r-- | src/easy_chat.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/easy_chat.c b/src/easy_chat.c index 4cc8b9c5b..2e384de6e 100644 --- a/src/easy_chat.c +++ b/src/easy_chat.c @@ -14,8 +14,8 @@ #include "gpu_regs.h" #include "graphics.h" #include "international_string_util.h" -#include "link.h" #include "main.h" +#include "mevent.h" #include "menu.h" #include "overworld.h" #include "palette.h" @@ -1318,7 +1318,7 @@ void ShowEasyChatScreen(void) words = gSaveBlock2Ptr->apprentices[0].easyChatWords; break; case EASY_CHAT_TYPE_QUESTIONNAIRE: - words = GetSaveBlock1Field3564(); + words = sub_801B058(); break; default: return; @@ -5531,7 +5531,7 @@ void InitializeEasyChatWordArray(u16 *words, u16 length) void sub_811F8BC(void) { int i; - u16 *words = GetSaveBlock1Field3564(); + u16 *words = sub_801B058(); for (i = 0; i < 4; i++) words[i] = 0xFFFF; } |