diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-07-16 20:23:05 +0200 |
| commit | ea5ffa3375f58c3d859f48d220a8a67fcb56fa61 (patch) | |
| tree | e04cbfe52909f094f9b7a0b20e927d0f5851b201 /src/text_window.c | |
| parent | ee3d505b585c5d0a8b6a8a68b8ab787d04bdc33a (diff) | |
| parent | 07ef76277021d5cddf14004e37e785c31fcea69b (diff) | |
Merge with master
Diffstat (limited to 'src/text_window.c')
| -rw-r--r-- | src/text_window.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/text_window.c b/src/text_window.c index 35afc2004..e7e8f0ca6 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -97,9 +97,9 @@ void LoadMessageBoxGfx(u8 windowId, u16 destOffset, u8 palOffset) LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20); } -void LoadSav2WindowGfx_(u8 windowId, u16 destOffset, u8 palOffset) +void LoadUserWindowBorderGfx_(u8 windowId, u16 destOffset, u8 palOffset) { - LoadSav2WindowGfx(windowId, destOffset, palOffset); + LoadUserWindowBorderGfx(windowId, destOffset, palOffset); } void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) @@ -108,7 +108,7 @@ void LoadWindowGfx(u8 windowId, u8 frameId, u16 destOffset, u8 palOffset) LoadPalette(sWindowFrames[frameId].pal, palOffset, 0x20); } -void LoadSav2WindowGfx(u8 windowId, u16 destOffset, u8 palOffset) +void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palOffset) { LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palOffset); } |