diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-11-03 00:04:30 -0400 |
commit | 1966f65696215a09066f6da70920703d6f3fd870 (patch) | |
tree | a77304e6d34ede3fa3d6c62b82859e6c12ba2f48 /src/field/easy_chat.c | |
parent | e08f3e4398d6c1dc21437e7b6462521ecfd299a6 (diff) | |
parent | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (diff) |
Merge branch 'master' of https://github.com/pret/pokeruby into fix_setmondata
Diffstat (limited to 'src/field/easy_chat.c')
-rw-r--r-- | src/field/easy_chat.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c index 6014b3d14..2668b57dd 100644 --- a/src/field/easy_chat.c +++ b/src/field/easy_chat.c @@ -278,13 +278,13 @@ void sub_80EB7C4(void) switch (gSpecialVar_0x8004) { case 0: - words = gSaveBlock1.unk2B1C; + words = gSaveBlock1.easyChats.unk2B1C; arg1 = 2; arg2 = 2; break; case 1: - words = gSaveBlock1.unk2B28; - if (sub_80EB680(gSaveBlock1.unk2B28, 3, 2, 20)) + words = gSaveBlock1.easyChats.unk2B28; + if (sub_80EB680(gSaveBlock1.easyChats.unk2B28, 3, 2, 20)) { arg1 = 2; arg2 = 3; @@ -296,12 +296,12 @@ void sub_80EB7C4(void) } break; case 2: - words = gSaveBlock1.unk2B34; + words = gSaveBlock1.easyChats.unk2B34; arg1 = 3; arg2 = 2; break; case 3: - words = gSaveBlock1.unk2B40; + words = gSaveBlock1.easyChats.unk2B40; arg1 = 3; arg2 = 2; break; |