diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2020-04-10 13:10:44 -0400 |
| commit | b22d3a821d8656d9fb88000ce02e5b885a59e1c3 (patch) | |
| tree | 7d4054b0df9f5746b3e31623868bf7d604ae7328 /src/option_menu.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/option_menu.c')
| -rw-r--r-- | src/option_menu.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/option_menu.c b/src/option_menu.c index 54cca0501..5a7bc42e4 100644 --- a/src/option_menu.c +++ b/src/option_menu.c @@ -1,20 +1,13 @@ #include "global.h" -#include "gpu_regs.h" +#include "gflib.h" #include "scanline_effect.h" #include "text_window_graphics.h" #include "menu.h" #include "menu_helpers.h" #include "task.h" -#include "palette.h" #include "overworld.h" -#include "malloc.h" #include "help_system.h" -#include "main.h" -#include "bg.h" -#include "window.h" -#include "text.h" #include "text_window.h" -#include "string_util.h" #include "strings.h" #include "field_fadetransition.h" #include "gba/m4a_internal.h" @@ -352,7 +345,7 @@ static bool8 LoadOptionMenuPalette(void) LoadPalette(stdpal_get(2), 0xF0, 0x20); break; case 3: - sub_814FDA0(1, 0x1B3, 0x30); + DrawWindowBorderWithStdpal3(1, 0x1B3, 0x30); break; default: return TRUE; |