From 978ca50dad8de72a3940b5423fd5c3b87c13eb46 Mon Sep 17 00:00:00 2001
From: Marcus Huderle <huderlem@gmail.com>
Date: Sat, 28 Oct 2017 17:35:37 -0700
Subject: Even more battle tower decompilation

---
 src/field/easy_chat.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/field/easy_chat.c')

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;
-- 
cgit v1.2.3


From 003d16e7a178e440c41f2bca365bf8f8f2a60b0e Mon Sep 17 00:00:00 2001
From: ProjectRevoTPP <projectrevotpp@hotmail.com>
Date: Sat, 4 Nov 2017 21:44:50 -0400
Subject: finish first wave of fixes

---
 src/field/easy_chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/field/easy_chat.c')

diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c
index 2668b57dd..8e7413516 100644
--- a/src/field/easy_chat.c
+++ b/src/field/easy_chat.c
@@ -161,7 +161,7 @@ u16 unref_sub_80EB5E0(u16 arg0)
     {
     case EC_GROUP_POKEMON: // 0
     case EC_GROUP_POKEMON_2: // 21
-        chars = (u8 *) gSpeciesNames[word];
+        chars = gSpeciesNames[word];
         break;
     case EC_GROUP_MOVE_1: // 18
     case EC_GROUP_MOVE_2: // 19
-- 
cgit v1.2.3


From d373f41c2cbd2dc71ca2287b179c7c8777b9eb02 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 26 Nov 2017 02:01:36 -0600
Subject: rename rng.c to random.c

---
 src/field/easy_chat.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/field/easy_chat.c')

diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c
index 8e7413516..7a4ae045e 100644
--- a/src/field/easy_chat.c
+++ b/src/field/easy_chat.c
@@ -4,7 +4,7 @@
 #include "event_data.h"
 #include "field_message_box.h"
 #include "pokedex.h"
-#include "rng.h"
+#include "random.h"
 #include "string_util.h"
 #include "strings.h"
 #include "strings2.h"
-- 
cgit v1.2.3


From 43349392dc4c79494af0e0727065c57ff78e1e92 Mon Sep 17 00:00:00 2001
From: camthesaxman <cameronghall@cox.net>
Date: Sun, 26 Nov 2017 14:04:00 -0600
Subject: easy_chat constants

---
 src/field/easy_chat.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/field/easy_chat.c')

diff --git a/src/field/easy_chat.c b/src/field/easy_chat.c
index 7a4ae045e..1dce5863e 100644
--- a/src/field/easy_chat.c
+++ b/src/field/easy_chat.c
@@ -1,5 +1,6 @@
 #include "global.h"
 #include "easy_chat.h"
+#include "constants/easy_chat.h"
 #include "data2.h"
 #include "event_data.h"
 #include "field_message_box.h"
-- 
cgit v1.2.3