From 53c56aa88db1eb214c60fec5f97d3d74f21e0bc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 10:11:25 +0100 Subject: decomp FUN_02024EF4 --- arm9/asm/unk_02024E64.s | 13 +------------ arm9/global.inc | 3 ++- arm9/src/unk_02024E64_c.c | 6 ++++++ 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index 6df427e8..bda5460c 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -8,18 +8,7 @@ - thumb_func_start FUN_02024EF4 -FUN_02024EF4: ; 0x02024EF4 - add r2, r0, #0x0 - add r0, r1, #0x0 - ldr r1, _02024F04 ; =0x00000724 - ldr r3, _02024F08 ; =CopyStringToU16Array - add r1, r2, r1 - mov r2, #0x8 - bx r3 - nop -_02024F04: .word 0x00000724 -_02024F08: .word CopyStringToU16Array + thumb_func_start FUN_02024F0C FUN_02024F0C: ; 0x02024F0C diff --git a/arm9/global.inc b/arm9/global.inc index 4dd5e543..fdea352f 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8525,4 +8525,5 @@ .extern FUN_02024EC0 .extern FUN_02024ECC .extern FUN_02024ED8 -.extern FUN_02024EE8 \ No newline at end of file +.extern FUN_02024EE8 +.extern FUN_02024EF4 \ No newline at end of file diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index 114951eb..48e1821e 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -1,6 +1,7 @@ #include "global.h" #include "MI_memory.h" #include "save_block_2.h" +#include "string16.h" extern void FUN_020250A4(void *param0); extern void FUN_02025484(void *param0); @@ -47,3 +48,8 @@ THUMB_FUNC u32 FUN_02024EE8(u32 param0) { return param0 + 0x00000724; } + +THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str) +{ + CopyStringToU16Array(str, buf + 0x392, 8); +} \ No newline at end of file -- cgit v1.2.3