summaryrefslogtreecommitdiff
path: root/include/window.h
diff options
context:
space:
mode:
authorU-User-PC\User <golemgalvanize@github.com>2017-10-09 13:32:57 -0400
committerU-User-PC\User <golemgalvanize@github.com>2017-10-09 13:32:57 -0400
commitf438734192e272af065820ad718ceb76ee59927a (patch)
tree9230432a4a80c4fb6d1ae106f872c0990d6f1cb5 /include/window.h
parentd361f7030abb3441bfe61e95c3803297454acbb8 (diff)
parent96c5966ff3676eb1b3463808b83b42e13e1591fd (diff)
fixing merge conflicts
Diffstat (limited to 'include/window.h')
-rw-r--r--include/window.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/window.h b/include/window.h
index 4e814ebc6..b630cd316 100644
--- a/include/window.h
+++ b/include/window.h
@@ -43,7 +43,7 @@ struct Window
bool16 InitWindows(const struct WindowTemplate *templates);
u16 AddWindow(const struct WindowTemplate *template);
-int AddWindowWithoutTileMap(struct WindowTemplate *template);
+int AddWindowWithoutTileMap(const struct WindowTemplate *template);
void RemoveWindow(u8 windowId);
void FreeAllWindowBuffers(void);
void CopyWindowToVram(u8 windowId, u8 mode);