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

Merge with master

Browse Source
This commit is contained in:
DizzyEggg
2018-07-16 20:23:05 +02:00
parent ee3d505b58 07ef762770
commit ea5ffa3375
1044 changed files with 7296 additions and 7064 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/text_window.c
View File

@@ -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);
}