diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-03 09:28:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 09:28:35 -0600 |
| commit | c9d2fcabefb149f259f97b59e15b4d635c52d2c6 (patch) | |
| tree | 3122377a548140355ae1a3350212cc52827bc9ac /src/mystery_event_menu.c | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
| parent | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (diff) | |
Merge pull request #553 from Phlosioneer/main-menu-state-machine
Document main_menu state machine, name window constants
Diffstat (limited to 'src/mystery_event_menu.c')
| -rw-r--r-- | src/mystery_event_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mystery_event_menu.c b/src/mystery_event_menu.c index 2058bb81f..ad4a2e692 100644 --- a/src/mystery_event_menu.c +++ b/src/mystery_event_menu.c @@ -90,7 +90,7 @@ void CB2_InitMysteryEventMenu(void) DeactivateAllTextPrinters(); for (i = 0; i < 2; i++) - FillWindowPixelBuffer(i, 0); + FillWindowPixelBuffer(i, PIXEL_FILL(0)); FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x1E, 0x14); LoadUserWindowBorderGfx(0, 1u, 0xD0u); @@ -133,7 +133,7 @@ static void CB2_MysteryEventMenu(void) switch (gMain.state) { case 0: - SetWindowBorderStyle(0, 1, 1, 0xD); + DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 0xD); PutWindowTilemap(0); CopyWindowToVram(0, 3); ShowBg(0); @@ -180,7 +180,7 @@ static void CB2_MysteryEventMenu(void) { PlaySE(SE_SELECT); CheckShouldAdvanceLinkState(); - SetWindowBorderStyle(1, 1, 1, 0xD); + DrawStdFrameWithCustomTileAndPalette(1, 1, 1, 0xD); PrintMysteryMenuText(1, gText_LoadingEvent, 1, 2, 0); PutWindowTilemap(1); CopyWindowToVram(1, 3); @@ -313,6 +313,6 @@ static void PrintMysteryMenuText(u8 windowId, const u8 *text, u8 x, u8 y, s32 sp textColor[1] = 2; textColor[2] = 3; - FillWindowPixelBuffer(windowId, (textColor[0]) | (textColor[0] << 4)); + FillWindowPixelBuffer(windowId, PIXEL_FILL(textColor[0])); AddTextPrinterParameterized4(windowId, 1, x, y, letterSpacing, lineSpacing, textColor, speed, text); } |