diff options
| author | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-11-26 13:55:24 -0700 |
| commit | 31d8bfb04850a9a1c1639b40b7ff305a673b9c09 (patch) | |
| tree | bba0c7d4e6230c2eecbb167b458bad89b8f01e04 /src/new_menu_helpers.c | |
| parent | d1142b4290e8688a0d42bfc1b95b9d90b1721459 (diff) | |
| parent | 19ecb1631b5fce1147077026a8eff890c6ec315a (diff) | |
fix merge conflicts
Diffstat (limited to 'src/new_menu_helpers.c')
| -rw-r--r-- | src/new_menu_helpers.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/new_menu_helpers.c b/src/new_menu_helpers.c index f879e6810..d2421ed9f 100644 --- a/src/new_menu_helpers.c +++ b/src/new_menu_helpers.c @@ -343,7 +343,7 @@ static u16 CopyDecompressedTileDataToVram(u8 bgId, const void *src, u16 size, u1 return LoadBgTilemap(bgId, src, size, offset); } -void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette) +void SetBgTilemapPalette(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette) { u8 i, j; u16 *ptr = GetBgTilemapBuffer(bgId); @@ -357,7 +357,7 @@ void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette) } } -void CopyRectIntoAltRect(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height) +void CopyToBufferFromBgTilemap(u8 bgId, u16 *dest, u8 left, u8 top, u8 width, u8 height) { u8 i,j; const u16 *src = GetBgTilemapBuffer(bgId); |