diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-24 10:26:55 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-05-24 10:26:55 -0400 |
| commit | 6ae395a6366ceefffe8f492911a4e517bdbbc7b2 (patch) | |
| tree | c4b431e94d3877897f8f26e68a7a39a2dce0cd9d /src/field_map_obj.c | |
| parent | 5539e282a39c34a278d1ea2fdc53ee46ffe154d5 (diff) | |
| parent | de60bdf2febff1879d7a1985a009dc439a546497 (diff) | |
Merge branch 'master' into contest
Diffstat (limited to 'src/field_map_obj.c')
| -rw-r--r-- | src/field_map_obj.c | 2 |
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" |