diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-23 21:49:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 21:49:49 -0400 |
| commit | 60b2c75191f87d5dc40e33547118cf1b3d1a8b01 (patch) | |
| tree | 9762af5db2f90d206b438d3d3812b716b9a31079 /include | |
| parent | 7147706d2d5112013fed79e9107f0ea1695907bd (diff) | |
| parent | 42307be2d2d7a193b3968f7bbea79c115192a2d8 (diff) | |
Merge pull request #90 from jiangzhengwenjz/nonmatching
'real' match CopyTileMapEntry
Diffstat (limited to 'include')
| -rw-r--r-- | include/bg.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/bg.h b/include/bg.h index 40c51167f..0d6b0e171 100644 --- a/include/bg.h +++ b/include/bg.h @@ -90,14 +90,14 @@ void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset); void CopyBgTilemapBufferToVram(u8 bg); void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height); void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, const void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette); -void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2); +void CopyRectToBgTilemapBufferRect(u8 bg, const void* src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, s16 tileOffset, s16 palette2); void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height); void FillBgTilemapBufferRect(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height, u8 palette); void WriteSequenceToBgTilemapBuffer(u8 bg, u16 firstTileNum, u8 x, u8 y, u8 width, u8 height, u8 paletteSlot, s16 tileNumDelta); u16 GetBgMetricTextMode(u8 bg, u8 whichMetric); u32 GetBgMetricAffineMode(u8 bg, u8 whichMetric); u32 GetTileMapIndexFromCoords(s32 x, s32 y, s32 screenSize, u32 screenWidth, u32 screenHeight); -void CopyTileMapEntry(u16 *src, u16 *dest, s32 palette1, u32 tileOffset, u32 palette2); +void CopyTileMapEntry(const u16 *src, u16 *dest, s32 palette1, s32 tileOffset, s32 palette2); u32 GetBgType(u8 bg); bool32 IsInvalidBg32(u8 bg); bool32 IsTileMapOutsideWram(u8 bg); |