diff --git a/ctr/3dsx_custom_crt0.s b/ctr/3dsx_custom_crt0.s index 418e019115..fde35a1dca 100644 --- a/ctr/3dsx_custom_crt0.s +++ b/ctr/3dsx_custom_crt0.s @@ -39,7 +39,7 @@ startup: @ System initialization mov r0, r4 - and r4, sp, #7 + and r4, sp, #7 bl initSystem @ Set up argc/argv arguments for main() @@ -48,10 +48,10 @@ startup: ldr r0, [r0] ldr r1, [r1] - @ Jump to user code + @ Jump to user code ldr r3, =main - cmp r4, #0 - ldrne r3, =ctr_request_update + cmp r4, #0 + ldrne r3, =ctr_request_update ldr lr, =__ctru_exit bx r3 diff --git a/ctr/ctr_system.c b/ctr/ctr_system.c index 2a7ba4739c..8e84d90124 100644 --- a/ctr/ctr_system.c +++ b/ctr/ctr_system.c @@ -153,23 +153,20 @@ void __system_initArgv() __system_argv[__system_argc] = NULL; } - void initSystem(void (*retAddr)(void)) { __libctru_init(retAddr); __appInit(); __libc_init_array(); - } + void __attribute__((noreturn)) __ctru_exit(int rc) { __libc_fini_array(); __appExit(); __libctru_exit(rc); - } - int ctr_request_update(void) { gfxInit(GSP_BGR8_OES,GSP_RGB565_OES,false);