diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-23 10:31:52 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-23 10:31:52 -0400 |
| commit | 4a42e2a710ee550c88a56e48f436b88279337eea (patch) | |
| tree | 11a42e2211643e8abe059f51560d8c451e1e3c50 /src/option_menu.c | |
| parent | 60ca1aa3fd4beaf7a4be7a61727ca832a4c489ef (diff) | |
| parent | 2e077f09e43e502a9ffaa93a916babe99b0d6e08 (diff) | |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index e0473b5c3..1cf0bad2e 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -77,11 +77,9 @@ static void DrawTextOption(void); static void DrawOptionMenuTexts(void); static void sub_80BB154(void); -// EWRAM vars EWRAM_DATA static bool8 sArrowPressed = FALSE; -// const rom data -static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); +static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal"); // note: this is only used in the Japanese release static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); @@ -141,7 +139,7 @@ static const struct BgTemplate sOptionMenuBgTemplates[] = } }; -static const u16 sUnknown_0855C6A0[] = {0x7E51}; +static const u16 sOptionMenuBg_Pal[] = {RGB(17, 18, 31)}; // code static void MainCB2(void) @@ -209,12 +207,12 @@ void CB2_InitOptionMenu(void) gMain.state++; break; case 4: - LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0)); + LoadPalette(sOptionMenuBg_Pal, 0, sizeof(sOptionMenuBg_Pal)); LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20); gMain.state++; break; case 5: - LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604)); + LoadPalette(sOptionMenuText_Pal, 16, sizeof(sOptionMenuText_Pal)); gMain.state++; break; case 6: |