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/text_window.c | |
| parent | 8626240b54d87449e5db70345840ccf20717d8c7 (diff) | |
| parent | 2880cf2a51ea36fa36f00d9ecf07177e5955c882 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into modern_gcc
Diffstat (limited to 'src/text_window.c')
| -rw-r--r-- | src/text_window.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/text_window.c b/src/text_window.c index 6fde39078..b4914e07b 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -1,7 +1,5 @@ #include "global.h" -#include "bg.h" -#include "palette.h" -#include "window.h" +#include "gflib.h" #include "text_window.h" #include "text_window_graphics.h" #include "quest_log.h" @@ -28,7 +26,7 @@ void sub_814FD6C(u8 bgId, u16 destOffset, u8 palIdx) LoadPalette(stdpal_get(1), palIdx, 32); } -void sub_814FDA0(u8 bgId, u16 destOffset, u8 palIdx) +void DrawWindowBorderWithStdpal3(u8 bgId, u16 destOffset, u8 palIdx) { LoadBgTiles(bgId, gStdFrame0, 0x120, destOffset); LoadPalette(stdpal_get(3), palIdx, 32); |