From 45f5ad2cb03af2cfd4fc5bd15513c3bd61540cc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 10:02:05 +0100 Subject: decomp FUN_02024ED8 --- arm9/asm/unk_02024E64.s | 9 --------- arm9/global.inc | 3 ++- arm9/src/unk_02024E64_c.c | 6 ++++++ 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'arm9') diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index 991f1558..68ed3f77 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -5,15 +5,6 @@ - thumb_func_start FUN_02024ED8 -FUN_02024ED8: ; 0x02024ED8 - push {r3, lr} - mov r1, #0xa - bl SavArray_get - mov r1, #0x7 - lsl r1, r1, #0x8 - add r0, r0, r1 - pop {r3, pc} thumb_func_start FUN_02024EE8 FUN_02024EE8: ; 0x02024EE8 diff --git a/arm9/global.inc b/arm9/global.inc index e0d8a4b1..ec71589a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8523,4 +8523,5 @@ .extern FUN_02024E6C .extern FUN_02024EB4 .extern FUN_02024EC0 -.extern FUN_02024ECC \ No newline at end of file +.extern FUN_02024ECC +.extern FUN_02024ED8 \ No newline at end of file diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index b64d165d..8831d772 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -35,4 +35,10 @@ THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) THUMB_FUNC void *FUN_02024ECC(struct SaveBlock2 *sav2) { return SavArray_get(sav2, 0xa); +} + +THUMB_FUNC void* FUN_02024ED8(struct SaveBlock2 *sav2) { + void* res = SavArray_get(sav2, 0xa); + return res + (7 << 8); + } \ No newline at end of file -- cgit v1.2.3