diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-04-05 08:41:31 -0400 |
commit | a58d9a16dd7e4f263ebccda50e70103e7490886b (patch) | |
tree | ddde359501adee874131731c700862c615c46e77 /src/text_window.c | |
parent | a677d1f4cb6f2925e9694b8d2b408273dcd13d9b (diff) | |
parent | 9e74409bb2032e25d431dda116462759e5b51fe0 (diff) |
Merge branch 'master' into dodrio_berry_picking
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 517f4bdb9..98fc09e87 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -113,7 +113,7 @@ void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset) LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); } -void sub_8098858(u8 windowId, u16 tileNum, u8 palNum) +void DrawTextBorderOuter(u8 windowId, u16 tileNum, u8 palNum) { u8 bgLayer = GetWindowAttribute(windowId, WINDOW_BG); u16 tilemapLeft = GetWindowAttribute(windowId, WINDOW_TILEMAP_LEFT); @@ -131,7 +131,7 @@ void sub_8098858(u8 windowId, u16 tileNum, u8 palNum) FillBgTilemapBufferRect(bgLayer, tileNum + 8, tilemapLeft + width, tilemapTop + height, 1, 1, palNum); } -void sub_80989E0(u8 windowId, u16 tileNum, u8 palNum) +void DrawTextBorderInner(u8 windowId, u16 tileNum, u8 palNum) { u8 bgLayer = GetWindowAttribute(windowId, WINDOW_BG); u16 tilemapLeft = GetWindowAttribute(windowId, WINDOW_TILEMAP_LEFT); |