summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-04-09 11:14:37 -0700
committerGitHub <noreply@github.com>2018-04-09 11:14:37 -0700
commit84c5825c8ecc9804313ec3b1a8dcc0271ee4c2cc (patch)
treec90f705e43f2b1728ed1e0400312b7d6c5c81c21 /src/util.c
parent562dcc4bcdc14d5b6c0bb2a638410156945cdd41 (diff)
parent91f869d1e6ed1ef12ad4b2255d3762e3b1b51429 (diff)
Merge pull request #589 from PikalaxALT/unk_debug_menu_3
Unk Debug Menu 3 and Start Menu Debug
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/util.c b/src/util.c
index 582b9f806..2e76cf4de 100644
--- a/src/util.c
+++ b/src/util.c
@@ -231,7 +231,7 @@ void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
#else
-__attribute__((naked)) void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
+NAKED void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output)
{
asm("\n"
" .syntax unified\n"
@@ -490,7 +490,7 @@ int CountTrailingZeroBits(u32 value)
return 0;
}
-u16 CalcCRC16(u8 *data, int length)
+u16 CalcCRC16(const u8 *data, int length)
{
u16 i, j;
u16 crc = 0x1121;