diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-01 15:25:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-01 15:25:22 -0400 |
| commit | cd4462f58cce785f408af26a7a3b11ad08575a5a (patch) | |
| tree | 2a35a97aa4fb1eae38861178967e6806b4f00e00 /src/text_window.c | |
| parent | 471608b56abbdf70a452896a0d895ffa5b4b06f9 (diff) | |
| parent | e006569719969870ce480916a23cfd157fdcf454 (diff) | |
Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
Diffstat (limited to 'src/text_window.c')
| -rw-r--r-- | src/text_window.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/text_window.c b/src/text_window.c index b4914e07b..9c5c7f2b3 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -6,7 +6,7 @@ extern const u16 gUnknown_841F1C8[]; -void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx); +void LoadWindowGfx(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx); void sub_814FD04(u8 bgId, u16 destOffset, u8 palIdx) { @@ -45,7 +45,7 @@ void sub_814FDF4(u8 bgId, u8 frameType, u16 destOffset, u8 palIdx) void LoadUserWindowBorderGfx(u8 windowId, u16 destOffset, u8 palIdx) { - sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx); + LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx); } void sub_814FE6C(u8 windowId, u16 destOffset, u8 palIdx) @@ -82,7 +82,7 @@ void TextWindow_LoadTilesStdFrame1(u8 windowId, u16 destOffset) LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gStdFrame1, 0x280, destOffset); } -void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx) +void LoadWindowGfx(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx) { LoadBgTiles(GetWindowAttribute(windowId, WINDOW_BG), gUserFrames[frameType].tiles, 0x120, destOffset); LoadPalette(gUserFrames[frameType].palette, palIdx, 32); @@ -90,7 +90,7 @@ void sub_814FFC4(u8 windowId, u8 frameType, u16 destOffset, u8 palIdx) void TextWindow_SetUserSelectedFrame(u8 windowId, u16 destOffset, u8 palIdx) { - sub_814FFC4(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx); + LoadWindowGfx(windowId, gSaveBlock2Ptr->optionsWindowFrameType, destOffset, palIdx); } void DrawTextBorderOuter(u8 windowId, u16 tileNum, u8 palNum) |