summaryrefslogtreecommitdiff
path: root/src/field_map_obj.c
diff options
context:
space:
mode:
authorDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
committerDiegoisawesome <diego@domoreaweso.me>2018-05-11 17:24:32 -0500
commit23b050a99e9603d038743dc14a36c808a822423f (patch)
tree7463de4a9c999351a3e07a24edbc4555d2c0d592 /src/field_map_obj.c
parent4e2886db8179072badaad0a3ff131b95dd0a7e94 (diff)
Update naked attribute and ASM_DIRECT to NAKED macro
Diffstat (limited to 'src/field_map_obj.c')
-rw-r--r--src/field_map_obj.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 81cbe5210..af018eb16 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -353,7 +353,7 @@ static u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u
return slot;
}
#else
-static __attribute__((naked)) u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
+static NAKED u8 InitFieldObjectStateFromTemplate(struct MapObjectTemplate *template, u8 mapId, u8 mapGroupId)
{
asm_unified("\tpush {r4-r7,lr}\n"
"\tmov r7, r9\n"