diff options
author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
---|---|---|
committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-15 00:47:34 -0600 |
commit | ce0e5cbfe4439a9767134a670868f65cc9920e65 (patch) | |
tree | 07d1e496a653dc2c6584022cb977bbdf273858aa /src/text_window.c | |
parent | 6e6e11205d312a296391ec7d16d809e52c5b4027 (diff) | |
parent | 3fb2a488f99d4d8499a2b0247f73f45837b07156 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps
Diffstat (limited to 'src/text_window.c')
-rw-r--r-- | src/text_window.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/text_window.c b/src/text_window.c index 55aedf688..336536c04 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -23,7 +23,7 @@ const struct TilesPal* sub_8098758(u8 id) void copy_textbox_border_tile_patterns_to_vram(u8 windowId, u16 destOffset, u8 palOffset) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gUnknown_08DDD748, 0x1C0, destOffset); - LoadPalette(sub_8098C64(), palOffset, 0x20); + LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); } void box_border_load_tiles_and_pal(u8 windowId, u16 destOffset, u8 palOffset) @@ -113,7 +113,7 @@ const u16* stdpal_get(u8 id) return &gUnknown_0851017C[id]; } -const u16* sub_8098C64(void) +const u16* GetOverworldTextboxPalettePtr(void) { return gUnknown_08DDD728; } |