Label missing easy chat symbols

5 files changed, 17 insertions, 14 deletions

diff --git a/graphics/misc/interview.pal b/graphics/easy_chat/interview.pal
index dfe91b5de..dfe91b5de 100644
--- a/graphics/misc/interview.pal
+++ b/graphics/easy_chat/interview.pal
diff --git a/graphics/misc/interview_frame.png b/graphics/easy_chat/interview_frame.png
index 63470e729..63470e729 100644
--- a/graphics/misc/interview_frame.png
+++ b/graphics/easy_chat/interview_frame.png
diff --git a/graphics/misc/8597C24.pal b/graphics/easy_chat/text.pal
index 5c8eed0ba..5c8eed0ba 100644
--- a/graphics/misc/8597C24.pal
+++ b/graphics/easy_chat/text.pal
diff --git a/graphics/misc/8597C1C.pal b/graphics/easy_chat/title_text.pal
index c075c5ce1..c075c5ce1 100644
--- a/graphics/misc/8597C1C.pal
+++ b/graphics/easy_chat/title_text.pal
diff --git a/src/easy_chat.c b/src/easy_chat.c
index fcbd1fba3..13e89c31f 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -230,14 +230,14 @@ static void DoQuizSetQuestionEasyChatScreen(void);
 #define PALTAG_TRIANGLE_CURSOR 0
 #define PALTAG_RECTANGLE_CURSOR 1
 #define PALTAG_MISC_UI 2
-#define PALTAG_3 3
+#define PALTAG_RS_INTERVIEW_FRAME 3
 
 #define GFXTAG_TRIANGLE_CURSOR 0
 #define GFXTAG_RECTANGLE_CURSOR 1
 #define GFXTAG_SCROLL_INDICATOR 2
 #define GFXTAG_START_SELECT_BUTTONS 3
 #define GFXTAG_MODE_WINDOW 4
-#define GFXTAG_5 5
+#define GFXTAG_RS_INTERVIEW_FRAME 5
 #define GFXTAG_BUTTON_WINDOW 6
 
 // State values for sEasyChatScreen->inputState
@@ -698,13 +698,16 @@ static const u16 sTriangleCursor_Pal[] = INCBIN_U16("graphics/easy_chat/triangle
 static const u32 sTriangleCursor_Gfx[] = INCBIN_U32("graphics/easy_chat/triangle_cursor.4bpp");
 static const u32 sScrollIndicator_Gfx[] = INCBIN_U32("graphics/easy_chat/scroll_indicator.4bpp");
 static const u32 sStartSelectButtons_Gfx[] = INCBIN_U32("graphics/easy_chat/start_select_buttons.4bpp");
-static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal");
-static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz");
+// In Ruby/Sapphire Easy Chat screens had a black background, and when the player & interviewer were present
+// on screen the interview_frame gfx was shown behind them.
+// In Emerald all Easy Chat screens have a filled background, so these gfx go unused
+static const u16 sRSInterviewFrame_Pal[] = INCBIN_U16("graphics/easy_chat/interview_frame.gbapal");
+static const u32 sRSInterviewFrame_Gfx[] = INCBIN_U32("graphics/easy_chat/interview_frame.4bpp.lz");
 static const u16 sTextInputFrameOrange_Pal[] = INCBIN_U16("graphics/easy_chat/text_input_frame_orange.gbapal");
 static const u16 sTextInputFrameGreen_Pal[] = INCBIN_U16("graphics/easy_chat/text_input_frame_green.gbapal");
 static const u32 sTextInputFrame_Gfx[] = INCBIN_U32("graphics/easy_chat/text_input_frame.4bpp.lz");
-static const u16 sUnknown_08597C1C[] = INCBIN_U16("graphics/misc/8597C1C.gbapal");
-static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal");
+static const u16 sTitleText_Pal[] = INCBIN_U16("graphics/easy_chat/title_text.gbapal");
+static const u16 sText_Pal[] = INCBIN_U16("graphics/easy_chat/text.gbapal");
 
 static const struct EasyChatPhraseFrameDimensions sPhraseFrameDimensions[] = {
     [FRAMEID_GENERAL_2x2] = {
@@ -895,17 +898,17 @@ static const struct SpritePalette sSpritePalettes[] = {
         .tag = PALTAG_MISC_UI, // The palette is generated from the button window but used for various parts of the UI
     },
     {
-        .data = sUnknown_085979C0,
-        .tag = PALTAG_3,
+        .data = sRSInterviewFrame_Pal,
+        .tag = PALTAG_RS_INTERVIEW_FRAME,
     },
     {0}
 };
 
 static const struct CompressedSpriteSheet sCompressedSpriteSheets[] = {
     {
-        .data = sUnknown_085979E0,
+        .data = sRSInterviewFrame_Gfx,
         .size = 0x800,
-        .tag = GFXTAG_5,
+        .tag = GFXTAG_RS_INTERVIEW_FRAME,
     },
     {
         .data = gEasyChatRectangleCursor_Gfx,
@@ -3914,10 +3917,10 @@ static void LoadEasyChatPalettes(void)
     LoadPalette(gEasyChatMode_Pal, 0, 32);
     LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32);
     LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32);
-    LoadPalette(sUnknown_08597C1C, 10 * 16, 8);
-    LoadPalette(sUnknown_08597C24, 11 * 16, 12);
-    LoadPalette(sUnknown_08597C24, 15 * 16, 12);
-    LoadPalette(sUnknown_08597C24, 3 * 16, 12);
+    LoadPalette(sTitleText_Pal, 10 * 16, 8);
+    LoadPalette(sText_Pal, 11 * 16, 12);
+    LoadPalette(sText_Pal, 15 * 16, 12);
+    LoadPalette(sText_Pal, 3 * 16, 12);
 }
 
 static void PrintTitle(void)