dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

option menu fix conflicts

Browse Source
This commit is contained in:
DizzyEggg
2018-01-21 12:46:19 +01:00
parent 77352c7ee4 8a60952fc0
commit ad2ef517bd
734 changed files with 44889 additions and 16751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/text_window.c
View File

@@ -8,7 +8,7 @@ extern u8 LoadBgTiles(u8 bg, const void *src, u16 size, u16 destOffset);
extern void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette);
extern const struct TilesPal gUnknown_0851021C[20];
extern const u32 gUnknown_08DDD748[];
extern const u32 gMessageBox_Gfx[];
extern const u16 gUnknown_0851017C[];
extern const u16 gUnknown_08DDD728[];
@@ -22,7 +22,7 @@ const struct TilesPal* GetWindowFrameTilesPal(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);
LoadBgTiles(GetWindowAttribute(windowId, WINDOW_PRIORITY), gMessageBox_Gfx, 0x1C0, destOffset);
LoadPalette(GetOverworldTextboxPalettePtr(), palOffset, 0x20);
}