diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-05-11 17:36:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-11 17:36:11 -0500 |
| commit | d1df98361f2144b286472e239b2f4bd1ada7dedd (patch) | |
| tree | df5a7f6a47f1e9400fe2eac6fa2ab02f9c6904ee /src/field_map_obj.c | |
| parent | 3e93615e38842643b8dd115c1fd2e0b4a0dbcd01 (diff) | |
| parent | ce5fc0277a2155e12475de2f3dfcb5e72adc1a6e (diff) | |
Merge pull request #252 from Diegoisawesome/master
Fix sym_common end, rename ASM_DIRECT to NAKED
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" |