diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 08:36:51 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-16 19:00:07 -0500 |
commit | 236cbf96c8f94b8b2d23be8c72ee0e188e82842d (patch) | |
tree | c2042f78efdc37a5b64c9cd797cc0c66a0c80255 /include/text_window.h | |
parent | 50501396b21bf132cf71d0f5d353bf51d277ba27 (diff) | |
parent | c0d180a8702b9b20afe07b09316286f6406e5811 (diff) |
Merge origin/master into pikalaxalt/link
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 |