diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-04 12:11:31 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-04 12:11:31 -0400 |
| commit | be7d0bd3b02727affddb422bdd868f2d219fe181 (patch) | |
| tree | 2a888fe548d140e37456f6916075cc963fb51cee /src/text_window.c | |
| parent | 17b657d83a29919253675b06c12a9ea5471385b2 (diff) | |
| parent | 7940f121f66bb0ebe0932bc642c3d9b4015f79a7 (diff) | |
Merge branch 'master' into doc-menu
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 864bd0831..798b791ce 100644 --- a/src/text_window.c +++ b/src/text_window.c @@ -6,7 +6,6 @@ #include "bg.h" #include "graphics.h" -// const rom data const u8 gTextWindowFrame1_Gfx[] = INCBIN_U8("graphics/text_window/1.4bpp"); static const u8 sTextWindowFrame2_Gfx[] = INCBIN_U8("graphics/text_window/2.4bpp"); static const u8 sTextWindowFrame3_Gfx[] = INCBIN_U8("graphics/text_window/3.4bpp"); @@ -190,7 +189,8 @@ const u16 *GetOverworldTextboxPalettePtr(void) return gMessageBox_Pal; } -void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset) +// Effectively LoadUserWindowBorderGfx but specifying the bg directly instead of a window from that bg +void LoadUserWindowBorderGfxOnBg(u8 bg, u16 destOffset, u8 palOffset) { LoadBgTiles(bg, sWindowFrames[gSaveBlock2Ptr->optionsWindowFrameType].tiles, 0x120, destOffset); LoadPalette(GetWindowFrameTilesPal(gSaveBlock2Ptr->optionsWindowFrameType)->pal, palOffset, 0x20); |