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/battle_main.c | |
| parent | d3e54f72f75622ac6166403abf810419ce2dc62d (diff) | |
| parent | a529bcf0b696eaad60806a676397aac7ca9226d1 (diff) | |
Merge pull request #1166 from ketsuban/tidying
Tidy up naked functions
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 935a53ffe..99d48ef27 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3649,8 +3649,8 @@ static void BattleIntroOpponent1SendsOutMonAnimation(void) NAKED static void BattleIntroOpponent1SendsOutMonAnimation(void) { - asm(".syntax unified\n\ - push {r4-r6,lr}\n\ + asm_unified( + "push {r4-r6,lr}\n\ ldr r0, =gBattleTypeFlags\n\ ldr r2, [r0]\n\ movs r0, 0x80\n\ @@ -3728,8 +3728,7 @@ _0803B2F2:\n\ pop {r4-r6}\n\ pop {r0}\n\ bx r0\n\ - .pool\n\ - .syntax divided"); + .pool"); } #endif // NONMATCHING |