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/pokenav_main_menu.c | |
| parent | d3e54f72f75622ac6166403abf810419ce2dc62d (diff) | |
| parent | a529bcf0b696eaad60806a676397aac7ca9226d1 (diff) | |
Merge pull request #1166 from ketsuban/tidying
Tidy up naked functions
Diffstat (limited to 'src/pokenav_main_menu.c')
| -rw-r--r-- | src/pokenav_main_menu.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 155e30939..0e2425d4e 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -293,7 +293,7 @@ static const struct SpriteTemplate sUnknown_0861FB44 = bool32 InitPokenavMainMenu(void) { struct PokenavMainMenuResources *structPtr; - + structPtr = AllocSubstruct(0, sizeof(struct PokenavMainMenuResources)); if (structPtr == NULL) return FALSE; @@ -474,8 +474,8 @@ void sub_81C7990(u32 a0, u16 a1) NAKED void sub_81C79BC(const u16 *a0, const u16 *a1, u32 a2, u32 a3, u32 a4, u16 *a5) { - asm(".syntax unified\n\ - push {r4-r7,lr}\n\ + asm_unified( + "push {r4-r7,lr}\n\ mov r7, r10\n\ mov r6, r9\n\ mov r5, r8\n\ @@ -603,8 +603,7 @@ _081C7AAE:\n\ mov r10, r5\n\ pop {r4-r7}\n\ pop {r0}\n\ - bx r0\n\ - .syntax divided"); + bx r0"); } void PokenavFadeScreen(s32 fadeType) |