diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-04-12 10:12:37 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 10:12:37 -0400 |
| commit | 6001e107993d1da69decdf479abf8a661ad57dda (patch) | |
| tree | 9a430f0b70e0a24965378724f1bd28cd1a193dc1 /src/main_menu.c | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
| parent | 7a562d6bae78fd7c62ed2f804fd8dcc555d85d18 (diff) | |
Merge pull request #321 from PikalaxALT/modern_gcc
Get pokefirered_modern to build
Diffstat (limited to 'src/main_menu.c')
| -rw-r--r-- | src/main_menu.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/main_menu.c b/src/main_menu.c index 00ecd0fe3..8d5343852 100644 --- a/src/main_menu.c +++ b/src/main_menu.c @@ -352,7 +352,7 @@ static void Task_PrintMainMenuText(u8 taskId) AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, 2, 2, 2, sTextColor1, -1, gText_NewGame); MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY); - CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, 3); + CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_BOTH); break; case MAIN_MENU_CONTINUE: FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); @@ -364,8 +364,8 @@ static void Task_PrintMainMenuText(u8 taskId) MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]); PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME); - CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2); - CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 3); + CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX); + CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_BOTH); break; case MAIN_MENU_MYSTERYGIFT: FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10)); @@ -382,9 +382,9 @@ static void Task_PrintMainMenuText(u8 taskId) PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE); PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME); PutWindowTilemap(MAIN_MENU_WINDOW_MYSTERYGIFT); - CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2); - CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 2); - CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, 3); + CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX); + CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_GFX); + CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, COPYWIN_BOTH); break; } gTasks[taskId].func = Task_WaitDma3AndFadeIn; @@ -392,7 +392,7 @@ static void Task_PrintMainMenuText(u8 taskId) static void Task_WaitDma3AndFadeIn(u8 taskId) { - if (CheckForSpaceForDma3Request(-1) != -1) + if (WaitDma3Request(-1) != -1) { gTasks[taskId].func = Task_UpdateVisualSelection; BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, 0xFFFF); @@ -534,7 +534,7 @@ static void Task_ReturnToTileScreen(u8 taskId) static void MoveWindowByMenuTypeAndCursorPos(u8 menuType, u8 cursorPos) { u16 win0vTop, win0vBot; - SetGpuReg(REG_OFFSET_WIN0H, 0x12DE); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(18, 222)); switch (menuType) { default: @@ -578,8 +578,8 @@ static bool8 HandleMenuInput(u8 taskId) { PlaySE(SE_SELECT); BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 16, RGB_BLACK); - SetGpuReg(REG_OFFSET_WIN0H, 0xF0); - SetGpuReg(REG_OFFSET_WIN0V, 0xA0); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE(0, 240)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(0, 160)); gTasks[taskId].func = Task_ReturnToTileScreen; } else if (JOY_NEW(DPAD_UP) && gTasks[taskId].tCursorPos > 0) @@ -602,9 +602,9 @@ static void PrintMessageOnWindow4(const u8 *str) MainMenu_DrawWindow(&sWindowTemplate[4]); AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, 2, 0, 2, sTextColor1, 2, str); PutWindowTilemap(MAIN_MENU_WINDOW_ERROR); - CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, 2); - SetGpuReg(REG_OFFSET_WIN0H, 0x13DD); - SetGpuReg(REG_OFFSET_WIN0V, 0x739D); + CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, COPYWIN_GFX); + SetGpuReg(REG_OFFSET_WIN0H, WIN_RANGE( 19, 221)); + SetGpuReg(REG_OFFSET_WIN0V, WIN_RANGE(115, 157)); } static void PrintContinueStats(void) |