summaryrefslogtreecommitdiff
path: root/src/pokenav_main_menu.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/pokenav_main_menu.c')
-rw-r--r--src/pokenav_main_menu.c9
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)