From d433a8c48402fbf9f95cb300b1dd3ae99424189e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 21 Apr 2020 17:56:41 -0400 Subject: Dism three small funcs in rom2.s --- asm/entry.s | 4 ++-- asm/rom2.s | 28 +++++++++++++++++++++++----- global.inc | 4 ++-- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/asm/entry.s b/asm/entry.s index b0f1c340..6d7e0c17 100644 --- a/asm/entry.s +++ b/asm/entry.s @@ -70,9 +70,9 @@ _020008C4: add r1, r1, #60 ldr r0, _02000930 ; =0x01FF8000 str r0, [r1] - bl FUN_020EC5CC + bl _fp_init bl FUN_02000B64_dummy - bl FUN_020EC694 + bl __call_static_initializers ldr r1, _02000934 ; =0x02000C55 ldr lr, _02000938 ; =0xFFFF0000 tst sp, #4 diff --git a/asm/rom2.s b/asm/rom2.s index 5cca06fe..bcd66a51 100644 --- a/asm/rom2.s +++ b/asm/rom2.s @@ -120,12 +120,30 @@ _u32_div_f: ; 0x020EBE8C .incbin "baserom.nds", 0xF0070, 0x55C - .global FUN_020EC5CC -FUN_020EC5CC: - .incbin "baserom.nds", 0xF05CC, 0xC8 + arm_func_start _fp_init +_fp_init: ; 0x020EC5CC + bx lr + + arm_func_start sys_writec +sys_writec: ; 0x020EC5D0 + str lr, [sp, #-4]! + mov r1, r0 + mov r0, #0x3 + swi 0x123456 + ldr pc, [sp], #0x4 + + arm_func_start sys_readc +sys_readc: ; 0x020EC5E4 + str lr, [sp, #-4]! + mov r1, #0x0 + mov r0, #0x7 + swi 0x123456 + ldr pc, [sp], #0x4 + + .incbin "baserom.nds", 0xF05F8, 0x9C - .global FUN_020EC694 -FUN_020EC694: + arm_func_start __call_static_initializers +__call_static_initializers: ; 0x020EC694 .incbin "baserom.nds", 0xF0694, 0x7C .section .data diff --git a/global.inc b/global.inc index 2c8eac78..bd2790bd 100644 --- a/global.inc +++ b/global.inc @@ -467,8 +467,8 @@ .extern _ll_shl .extern _s32_div_f .extern _u32_div_f -.extern FUN_020EC5CC -.extern FUN_020EC694 +.extern _fp_init +.extern __call_static_initializers .extern FUN_021D74E0 .extern FUN_021D76AC .extern FUN_021D77C4 -- cgit v1.2.3