dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1103 from GriffinRichards/doc-optionpal

Browse Source 
Label option menu pal
This commit is contained in:
GriffinR
2020-07-19 15:53:17 -04:00
committed by GitHub
parent 5e1fb23aad 2273458d50
commit d91f02d984
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/option_menu.c
+4 -6
View File
@@ -77,11 +77,9 @@ static void DrawTextOption(void);
static void DrawOptionMenuTexts(void); static void DrawOptionMenuTexts(void);
static void sub_80BB154(void); static void sub_80BB154(void);
// EWRAM vars
EWRAM_DATA static bool8 sArrowPressed = FALSE; EWRAM_DATA static bool8 sArrowPressed = FALSE;
// const rom data static const u16 sOptionMenuText_Pal[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
static const u16 sUnknown_0855C604[] = INCBIN_U16("graphics/misc/option_menu_text.gbapal");
// note: this is only used in the Japanese release // note: this is only used in the Japanese release
static const u8 sEqualSignGfx[] = INCBIN_U8("graphics/misc/option_menu_equals_sign.4bpp"); 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 // code
static void MainCB2(void) static void MainCB2(void)
@@ -209,12 +207,12 @@ void CB2_InitOptionMenu(void)
gMain.state++; gMain.state++;
break; break;
case 4: case 4:
LoadPalette(sUnknown_0855C6A0, 0, sizeof(sUnknown_0855C6A0)); LoadPalette(sOptionMenuBg_Pal, 0, sizeof(sOptionMenuBg_Pal));
LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20); LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, 0x70, 0x20);
gMain.state++; gMain.state++;
break; break;
case 5: case 5:
LoadPalette(sUnknown_0855C604, 0x10, sizeof(sUnknown_0855C604)); LoadPalette(sOptionMenuText_Pal, 16, sizeof(sOptionMenuText_Pal));
gMain.state++; gMain.state++;
break; break;
case 6: case 6: