summaryrefslogtreecommitdiff
path: root/src/field_effect_helpers.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/field_effect_helpers.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/field_effect_helpers.c')
-rw-r--r--src/field_effect_helpers.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index bc4a1770e..216f39d62 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -1024,7 +1024,7 @@ static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
}
}
#else
-__attribute__((naked)) static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
+NAKED static void sub_812800C(struct MapObject *mapObject, struct Sprite *sprite)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r8\n"
@@ -1496,7 +1496,7 @@ static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
}
}
#else
-__attribute__((naked)) static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
+NAKED static void sub_812882C(struct Sprite *sprite /*r6*/, u8 z, u8 offset)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tadds r6, r0, 0\n"