diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-17 19:34:55 +0100 |
| commit | d0245cf8d23aa65a357977a00b21f58d42dfcf6e (patch) | |
| tree | cb5e1c81baaf882f2bb8f323b04a7b41d316be7b /include/text_window.h | |
| parent | 3e1f3d0e1e2bc5fbe5e630d81b741b653080e77b (diff) | |
| parent | a98c6bf210cec0591badb51be1e472c5fb4f1f1a (diff) | |
recorded battle merge conflicts fix
Diffstat (limited to 'include/text_window.h')
| -rw-r--r-- | include/text_window.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/text_window.h b/include/text_window.h index 0cefeea8e..da3fb301e 100644 --- a/include/text_window.h +++ b/include/text_window.h @@ -16,7 +16,7 @@ void sub_8098858(u8 windowId, u16 tileNum, u8 palNum); void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum); void rbox_fill_rectangle(u8 windowId); const u16* stdpal_get(u8 id); -const u16* sub_8098C64(void); +const u16* GetOverworldTextboxPalettePtr(void); void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset); #endif // GUARD_TEXT_WINDOW_H |