diff options
| author | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2018-01-16 17:09:36 -0500 |
| commit | d8bb1d15e7941d9689393f1215c82788a793af50 (patch) | |
| tree | 7006f3de7d3cf5a0fce6af66bd182d3d3f985854 /src/bg.c | |
| parent | 09d3da101bd1b1c9d7471e7a193f0af7cae0ab73 (diff) | |
| parent | 309640a28c63528fda8d6b50b9d5bb83eddeb8c9 (diff) | |
Merge branch 'master' into mac_build_and_libc
Diffstat (limited to 'src/bg.c')
| -rw-r--r-- | src/bg.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1007,7 +1007,7 @@ void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 dest } // Skipping for now, it probably uses structs passed by value /* -void CopyRectToBgTilemapBufferRect(u8 bg, 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, u16 tileOffset, u16 palette2) { u16 attribute; u16 mode; @@ -1049,7 +1049,7 @@ void CopyRectToBgTilemapBufferRect(u8 bg, void* src, u8 srcX, u8 srcY, u8 srcWid } }*/ __attribute__((naked)) -void CopyRectToBgTilemapBufferRect(u8 bg, 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, u16 tileOffset, u16 palette2) { asm("push {r4-r7,lr}\n\ mov r7, r10\n\ |