diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-14 11:29:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-14 11:29:23 -0400 |
| commit | 939bd127bba0ba3af5b94a288ab47a6e374adfe2 (patch) | |
| tree | af573b5e11dc940c31bfbdc928dd9b56938ac4d6 /src/new_menu_helpers.c | |
| parent | 31c26e862a3d775c2a78fac646c614efe96033c0 (diff) | |
| parent | 53b950019aca8896d70c4d5e4f9e2a1d5143e489 (diff) | |
Merge branch 'master' into battle_records
Diffstat (limited to 'src/new_menu_helpers.c')
| -rw-r--r-- | src/new_menu_helpers.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index 1939154da..9d2a5c883 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -603,7 +603,7 @@ void sub_80F771C(bool8 copyToVram) void SetStdWindowBorderStyle(u8 windowId, bool8 copyToVram) { - SetWindowBorderStyle(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM); + DrawStdFrameWithCustomTileAndPalette(windowId, copyToVram, STD_WINDOW_BASE_TILE_NUM, STD_WINDOW_PALETTE_NUM); } void sub_80F7768(u8 windowId, bool8 copyToVram) @@ -671,10 +671,8 @@ u8 sub_80F78E0(u8 height) { if (sStartMenuWindowId == 0xFF) { - struct WindowTemplate wTemp1, wTemp2; - SetWindowTemplateFields(&wTemp1, 0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D); - wTemp2 = wTemp1; - sStartMenuWindowId = AddWindow(&wTemp2); + struct WindowTemplate template = SetWindowTemplateFields(0, 0x16, 1, 7, height * 2 - 1, DLG_WINDOW_PALETTE_NUM, 0x13D); + sStartMenuWindowId = AddWindow(&template); PutWindowTilemap(sStartMenuWindowId); } return sStartMenuWindowId; |