diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-04-16 01:30:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-16 01:30:03 -0400 |
| commit | c1da6b29bc853df1a42f08adb9b141de747dae55 (patch) | |
| tree | 4a29484dd11d60bb13edc449adaa2e409f444af4 /src/option_menu.c | |
| parent | 70d0b81fe08e4b3baa5c3c7f8e81909c74477eb7 (diff) | |
| parent | f94540c2b875cff0085149b95728d2f0a0c610eb (diff) | |
Merge pull request #1405 from GriffinRichards/constants-display
Add more usage of DISPLAY constants, misc REG constants
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 936aff923..0174b69db 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -185,9 +185,9 @@ void CB2_InitOptionMenu(void) DeactivateAllTextPrinters(); SetGpuReg(REG_OFFSET_WIN0H, 0); SetGpuReg(REG_OFFSET_WIN0V, 0); - SetGpuReg(REG_OFFSET_WININ, 1); - SetGpuReg(REG_OFFSET_WINOUT, 35); - SetGpuReg(REG_OFFSET_BLDCNT, 193); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG0); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG0 | WINOUT_WIN01_BG1 | WINOUT_WIN01_CLR); + SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT1_BG0 | BLDCNT_EFFECT_DARKEN); SetGpuReg(REG_OFFSET_BLDALPHA, 0); SetGpuReg(REG_OFFSET_BLDY, 4); SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_WIN0_ON | DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); @@ -381,7 +381,7 @@ static void Task_OptionMenuFadeOut(u8 taskId) static void HighlightOptionMenuItem(u8 index) { - SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(16, 224)); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(16, DISPLAY_WIDTH - 16)); SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(index * 16 + 40, index * 16 + 56)); } |