summaryrefslogtreecommitdiff
path: root/include/text_window.h
diff options
context:
space:
mode:
authorgolem galvanize <golemgalvanize@github.com>2018-04-25 00:28:57 -0400
committergolem galvanize <golemgalvanize@github.com>2018-04-25 00:28:57 -0400
commit6a401b53867de87165f625510624c4a296dba34b (patch)
tree1a03aba54ebed695fffe2c11a1eb26f2b975f960 /include/text_window.h
parent069a7e71fc8bd0886fe2d5c39bb96d8fee0d798b (diff)
parent867b496f2e5a525043c9fd82ccaaad9349c89fac (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into decompile_pokedex
Diffstat (limited to 'include/text_window.h')
-rw-r--r--include/text_window.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/text_window.h b/include/text_window.h
index e6a753fcb..2ac13fab7 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -5,11 +5,11 @@
struct TilesPal
{
- const u32 *tiles;
+ const u8 *tiles;
const u16 *pal;
};
-extern const u32 gTextWindowFrame1_Gfx[];
+extern const u8 gTextWindowFrame1_Gfx[];
extern const u16 gTextWindowFrame1_Pal[];
const struct TilesPal* GetWindowFrameTilesPal(u8 id);