diff options
| author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-16 09:53:18 +0100 |
|---|---|---|
| committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-03-16 09:53:18 +0100 |
| commit | 7bd0b42dbf5374110f40becb4b27a5ba37621735 (patch) | |
| tree | 18607789b8fe5dd88bd5ae4a5398b601912491f4 | |
| parent | 0c4df699ac1c4d2e6085e9e117cd4e1c5879f430 (diff) | |
decomp FUN_02024E6C
| -rw-r--r-- | arm9/asm/unk_02024E64.s | 31 | ||||
| -rw-r--r-- | arm9/global.inc | 3 | ||||
| -rw-r--r-- | arm9/src/unk_02024E64_c.c | 47 |
3 files changed, 49 insertions, 32 deletions
diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s index 3b57116b..cfd56621 100644 --- a/arm9/asm/unk_02024E64.s +++ b/arm9/asm/unk_02024E64.s @@ -3,37 +3,6 @@ .text - thumb_func_start FUN_02024E6C -FUN_02024E6C: ; 0x02024E6C - push {r4, lr} - add r4, r0, #0x0 - ldr r2, _02024EA4 ; =0x0000074C - mov r0, #0x0 - add r1, r4, #0x0 - bl MIi_CpuClearFast - add r0, r4, #0x0 - bl FUN_020250A4 - mov r0, #0x7 - lsl r0, r0, #0x8 - add r0, r4, r0 - bl FUN_02025484 - ldr r1, _02024EA8 ; =0x00000724 - ldr r0, _02024EAC ; =0x0000FFFF - add r1, r4, r1 - mov r2, #0x8 - bl MIi_CpuClear16 - ldr r1, _02024EB0 ; =0x00000734 - ldr r0, _02024EAC ; =0x0000FFFF - add r1, r4, r1 - mov r2, #0xb - bl MIi_CpuClear16 - pop {r4, pc} - .balign 4 -_02024EA4: .word 0x0000074C -_02024EA8: .word 0x00000724 -_02024EAC: .word 0x0000FFFF -_02024EB0: .word 0x00000734 - thumb_func_start FUN_02024EB4 FUN_02024EB4: ; 0x02024EB4 ldr r3, _02024EBC ; =SavArray_get diff --git a/arm9/global.inc b/arm9/global.inc index f76e8d5a..c7d54591 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8519,4 +8519,5 @@ .extern CARDi_InitCommon .extern MonNotFaintedOrEgg .extern CountAlivePokemon -.extern FUN_02024E64
\ No newline at end of file +.extern FUN_02024E64 +.extern FUN_02024E6C
\ No newline at end of file diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index aca5698d..a3b958c0 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -1,5 +1,52 @@ #include "global.h" +#include "MI_memory.h" + + +extern void FUN_020250A4(void *param0); +extern void FUN_02025484(void* param0); THUMB_FUNC u32 FUN_02024E64() { return 0x0000074C; } + + +// thumb_func_start FUN_02024E6C +// FUN_02024E6C: ; 0x02024E6C +// push {r4, lr} +// add r4, r0, #0x0 +// ldr r2, _02024EA4 ; =0x0000074C +// mov r0, #0x0 +// add r1, r4, #0x0 +// bl MIi_CpuClearFast +// add r0, r4, #0x0 +// bl FUN_020250A4 +// mov r0, #0x7 +// lsl r0, r0, #0x8 +// add r0, r4, r0 +// bl FUN_02025484 +// ldr r1, _02024EA8 ; =0x00000724 +// ldr r0, _02024EAC ; =0x0000FFFF +// add r1, r4, r1 +// mov r2, #0x8 +// bl MIi_CpuClear16 +// ldr r1, _02024EB0 ; =0x00000734 +// ldr r0, _02024EAC ; =0x0000FFFF +// add r1, r4, r1 +// mov r2, #0xb +// bl MIi_CpuClear16 +// pop {r4, pc} +// .balign 4 +// _02024EA4: .word 0x0000074C +// _02024EA8: .word 0x00000724 +// _02024EAC: .word 0x0000FFFF +// _02024EB0: .word 0x00000734 +THUMB_FUNC void FUN_02024E6C(void* param0) { + MIi_CpuClearFast(0, param0, 0x0000074C); + + FUN_020250A4(param0); + + FUN_02025484(param0+(7<<8)); + + MIi_CpuClear16(0x0000FFFF, param0 + 0x00000724, 8); + MIi_CpuClear16(0x0000FFFF, param0 + 0x00000734, 0xb); +} |