diff options
| author | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
|---|---|---|
| committer | U-User-PC\User <golemgalvanize@github.com> | 2017-10-09 13:32:57 -0400 |
| commit | f438734192e272af065820ad718ceb76ee59927a (patch) | |
| tree | 9230432a4a80c4fb6d1ae106f872c0990d6f1cb5 /src/window.c | |
| parent | d361f7030abb3441bfe61e95c3803297454acbb8 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/window.c b/src/window.c index 704060b9d..f4cb48ec0 100644 --- a/src/window.c +++ b/src/window.c @@ -190,7 +190,7 @@ u16 AddWindow(const struct WindowTemplate *template) return win; } -int AddWindowWithoutTileMap(struct WindowTemplate *template) +int AddWindowWithoutTileMap(const struct WindowTemplate *template) { u16 win; u8 bgLayer; |