From 5ba858d19c7134c6bf40f97b276b819e3ff4261a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 31 Mar 2021 16:56:10 -0400 Subject: Label missing easy chat symbols --- graphics/easy_chat/interview.pal | 19 +++++++++++++++++++ graphics/easy_chat/interview_frame.png | Bin 0 -> 192 bytes graphics/easy_chat/text.pal | 9 +++++++++ graphics/easy_chat/title_text.pal | 7 +++++++ graphics/misc/8597C1C.pal | 7 ------- graphics/misc/8597C24.pal | 9 --------- graphics/misc/interview.pal | 19 ------------------- graphics/misc/interview_frame.png | Bin 192 -> 0 bytes src/easy_chat.c | 31 +++++++++++++++++-------------- 9 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 graphics/easy_chat/interview.pal create mode 100644 graphics/easy_chat/interview_frame.png create mode 100644 graphics/easy_chat/text.pal create mode 100644 graphics/easy_chat/title_text.pal delete mode 100644 graphics/misc/8597C1C.pal delete mode 100644 graphics/misc/8597C24.pal delete mode 100644 graphics/misc/interview.pal delete mode 100644 graphics/misc/interview_frame.png diff --git a/graphics/easy_chat/interview.pal b/graphics/easy_chat/interview.pal new file mode 100644 index 000000000..dfe91b5de --- /dev/null +++ b/graphics/easy_chat/interview.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +255 255 148 +255 197 148 +238 139 90 +189 90 41 +255 213 213 +246 180 180 +197 131 131 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +41 49 49 +98 98 98 +180 189 180 +222 213 222 +255 255 255 diff --git a/graphics/easy_chat/interview_frame.png b/graphics/easy_chat/interview_frame.png new file mode 100644 index 000000000..63470e729 Binary files /dev/null and b/graphics/easy_chat/interview_frame.png differ diff --git a/graphics/easy_chat/text.pal b/graphics/easy_chat/text.pal new file mode 100644 index 000000000..5c8eed0ba --- /dev/null +++ b/graphics/easy_chat/text.pal @@ -0,0 +1,9 @@ +JASC-PAL +0100 +6 +0 0 0 +255 255 255 +98 98 98 +222 213 222 +65 139 74 +230 230 230 diff --git a/graphics/easy_chat/title_text.pal b/graphics/easy_chat/title_text.pal new file mode 100644 index 000000000..c075c5ce1 --- /dev/null +++ b/graphics/easy_chat/title_text.pal @@ -0,0 +1,7 @@ +JASC-PAL +0100 +4 +0 0 0 +0 0 0 +57 205 255 +172 172 238 diff --git a/graphics/misc/8597C1C.pal b/graphics/misc/8597C1C.pal deleted file mode 100644 index c075c5ce1..000000000 --- a/graphics/misc/8597C1C.pal +++ /dev/null @@ -1,7 +0,0 @@ -JASC-PAL -0100 -4 -0 0 0 -0 0 0 -57 205 255 -172 172 238 diff --git a/graphics/misc/8597C24.pal b/graphics/misc/8597C24.pal deleted file mode 100644 index 5c8eed0ba..000000000 --- a/graphics/misc/8597C24.pal +++ /dev/null @@ -1,9 +0,0 @@ -JASC-PAL -0100 -6 -0 0 0 -255 255 255 -98 98 98 -222 213 222 -65 139 74 -230 230 230 diff --git a/graphics/misc/interview.pal b/graphics/misc/interview.pal deleted file mode 100644 index dfe91b5de..000000000 --- a/graphics/misc/interview.pal +++ /dev/null @@ -1,19 +0,0 @@ -JASC-PAL -0100 -16 -255 255 148 -255 197 148 -238 139 90 -189 90 41 -255 213 213 -246 180 180 -197 131 131 -0 0 0 -0 0 0 -0 0 0 -0 0 0 -41 49 49 -98 98 98 -180 189 180 -222 213 222 -255 255 255 diff --git a/graphics/misc/interview_frame.png b/graphics/misc/interview_frame.png deleted file mode 100644 index 63470e729..000000000 Binary files a/graphics/misc/interview_frame.png and /dev/null differ 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) -- cgit v1.2.3