ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Label missing easy chat symbols

Browse Source
This commit is contained in:
GriffinR 2021-03-31 16:56:10 -04:00
parent 771a434730
commit 5ba858d19c
5 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
graphics/misc/interview.pal → graphics/easy_chat/interview.pal
View File

0
graphics/misc/interview_frame.png → graphics/easy_chat/interview_frame.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 192 B

After

Width:  |  Height:  |  Size: 192 B

0
graphics/misc/8597C24.pal → graphics/easy_chat/text.pal
View File

0
graphics/misc/8597C1C.pal → graphics/easy_chat/title_text.pal
View File

31
src/easy_chat.c
View File

@ -230,14 +230,14 @@ static void DoQuizSetQuestionEasyChatScreen(void);
#define PALTAG_TRIANGLE_CURSOR 0 #define PALTAG_TRIANGLE_CURSOR 0
#define PALTAG_RECTANGLE_CURSOR 1 #define PALTAG_RECTANGLE_CURSOR 1
#define PALTAG_MISC_UI 2 #define PALTAG_MISC_UI 2
#define PALTAG_3 3 #define PALTAG_RS_INTERVIEW_FRAME 3
#define GFXTAG_TRIANGLE_CURSOR 0 #define GFXTAG_TRIANGLE_CURSOR 0
#define GFXTAG_RECTANGLE_CURSOR 1 #define GFXTAG_RECTANGLE_CURSOR 1
#define GFXTAG_SCROLL_INDICATOR 2 #define GFXTAG_SCROLL_INDICATOR 2
#define GFXTAG_START_SELECT_BUTTONS 3 #define GFXTAG_START_SELECT_BUTTONS 3
#define GFXTAG_MODE_WINDOW 4 #define GFXTAG_MODE_WINDOW 4
#define GFXTAG_5 5 #define GFXTAG_RS_INTERVIEW_FRAME 5
#define GFXTAG_BUTTON_WINDOW 6 #define GFXTAG_BUTTON_WINDOW 6
// State values for sEasyChatScreen->inputState // 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 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 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 u32 sStartSelectButtons_Gfx[] = INCBIN_U32("graphics/easy_chat/start_select_buttons.4bpp");
static const u16 sUnknown_085979C0[] = INCBIN_U16("graphics/misc/interview_frame.gbapal"); // In Ruby/Sapphire Easy Chat screens had a black background, and when the player & interviewer were present
static const u32 sUnknown_085979E0[] = INCBIN_U32("graphics/misc/interview_frame.4bpp.lz"); // 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 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 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 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 sTitleText_Pal[] = INCBIN_U16("graphics/easy_chat/title_text.gbapal");
static const u16 sUnknown_08597C24[] = INCBIN_U16("graphics/misc/8597C24.gbapal"); static const u16 sText_Pal[] = INCBIN_U16("graphics/easy_chat/text.gbapal");
static const struct EasyChatPhraseFrameDimensions sPhraseFrameDimensions[] = { static const struct EasyChatPhraseFrameDimensions sPhraseFrameDimensions[] = {
[FRAMEID_GENERAL_2x2] = { [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 .tag = PALTAG_MISC_UI, // The palette is generated from the button window but used for various parts of the UI
}, },
{ {
.data = sUnknown_085979C0, .data = sRSInterviewFrame_Pal,
.tag = PALTAG_3, .tag = PALTAG_RS_INTERVIEW_FRAME,
}, },
{0} {0}
}; };
static const struct CompressedSpriteSheet sCompressedSpriteSheets[] = { static const struct CompressedSpriteSheet sCompressedSpriteSheets[] = {
{ {
.data = sUnknown_085979E0, .data = sRSInterviewFrame_Gfx,
.size = 0x800, .size = 0x800,
.tag = GFXTAG_5, .tag = GFXTAG_RS_INTERVIEW_FRAME,
}, },
{ {
.data = gEasyChatRectangleCursor_Gfx, .data = gEasyChatRectangleCursor_Gfx,
@ -3914,10 +3917,10 @@ static void LoadEasyChatPalettes(void)
LoadPalette(gEasyChatMode_Pal, 0, 32); LoadPalette(gEasyChatMode_Pal, 0, 32);
LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32); LoadPalette(sTextInputFrameOrange_Pal, 1 * 16, 32);
LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32); LoadPalette(sTextInputFrameGreen_Pal, 4 * 16, 32);
LoadPalette(sUnknown_08597C1C, 10 * 16, 8); LoadPalette(sTitleText_Pal, 10 * 16, 8);
LoadPalette(sUnknown_08597C24, 11 * 16, 12); LoadPalette(sText_Pal, 11 * 16, 12);
LoadPalette(sUnknown_08597C24, 15 * 16, 12); LoadPalette(sText_Pal, 15 * 16, 12);
LoadPalette(sUnknown_08597C24, 3 * 16, 12); LoadPalette(sText_Pal, 3 * 16, 12);
} }
static void PrintTitle(void) static void PrintTitle(void)