diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-04 19:41:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-04 19:41:18 -0400 |
| commit | 8324a355176b2edbc3ad4ab8aec03f3fc7eb0a8c (patch) | |
| tree | 121ad567c35ed42d056565758163d7c385152805 /src/pokedex.c | |
| parent | d3e54f72f75622ac6166403abf810419ce2dc62d (diff) | |
| parent | a529bcf0b696eaad60806a676397aac7ca9226d1 (diff) | |
Merge pull request #1166 from ketsuban/tidying
Tidy up naked functions
Diffstat (limited to 'src/pokedex.c')
| -rw-r--r-- | src/pokedex.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/pokedex.c b/src/pokedex.c index 458d6c94b..4f41c5557 100644 --- a/src/pokedex.c +++ b/src/pokedex.c @@ -5258,11 +5258,11 @@ void SetSearchRectHighlight(u8 flags, u8 x, u8 y, u8 width) } } #else -__attribute__((naked)) +NAKED void SetSearchRectHighlight(u8 flags, u8 x, u8 y, u8 width) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ + asm_unified( + "push {r4-r7,lr}\n\ mov r7, r8\n\ push {r7}\n\ adds r4, r3, 0\n\ @@ -5310,8 +5310,7 @@ _080C1DEC:\n\ pop {r4-r7}\n\ pop {r0}\n\ bx r0\n\ - .pool\n\ - .syntax divided\n"); + .pool"); } #endif |