From 0c4df699ac1c4d2e6085e9e117cd4e1c5879f430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 09:40:27 +0100 Subject: decomp FUN_02024E64 --- arm9/src/unk_02024E64_c.c | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 arm9/src/unk_02024E64_c.c (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c new file mode 100644 index 00000000..aca5698d --- /dev/null +++ b/arm9/src/unk_02024E64_c.c @@ -0,0 +1,5 @@ +#include "global.h" + +THUMB_FUNC u32 FUN_02024E64() { + return 0x0000074C; +} -- cgit v1.2.3 From 7bd0b42dbf5374110f40becb4b27a5ba37621735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 09:53:18 +0100 Subject: decomp FUN_02024E6C --- arm9/src/unk_02024E64_c.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) (limited to 'arm9/src') 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); +} -- cgit v1.2.3 From b37cbfed36a331b574c3a17c557293ccd187874d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 09:56:29 +0100 Subject: decomp FUN_02024EB4 --- arm9/src/unk_02024E64_c.c | 48 ++++++++++++----------------------------------- 1 file changed, 12 insertions(+), 36 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index a3b958c0..08982a4f 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -1,52 +1,28 @@ #include "global.h" #include "MI_memory.h" - +#include "save_block_2.h" extern void FUN_020250A4(void *param0); -extern void FUN_02025484(void* param0); +extern void FUN_02025484(void *param0); -THUMB_FUNC u32 FUN_02024E64() { +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) { +THUMB_FUNC void FUN_02024E6C(void *param0) +{ MIi_CpuClearFast(0, param0, 0x0000074C); FUN_020250A4(param0); - FUN_02025484(param0+(7<<8)); + FUN_02025484(param0 + (7 << 8)); MIi_CpuClear16(0x0000FFFF, param0 + 0x00000724, 8); MIi_CpuClear16(0x0000FFFF, param0 + 0x00000734, 0xb); } + +THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) +{ + return SavArray_get(sav2, 0xa); +} \ No newline at end of file -- cgit v1.2.3 From d0d866e6b7478d051e3943fdfaa3fc5ff0a5b5dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 09:58:32 +0100 Subject: decomp FUN_02024EC0 --- arm9/src/unk_02024E64_c.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index 08982a4f..04c26f16 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -25,4 +25,9 @@ THUMB_FUNC void FUN_02024E6C(void *param0) THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) { return SavArray_get(sav2, 0xa); +} + +THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) +{ + return FUN_02022634(sav2, 0xa); } \ No newline at end of file -- cgit v1.2.3 From 6ae1b13784323e8d952d97d9f19c820d346d11ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 09:59:29 +0100 Subject: decomp FUN_02024ECC --- arm9/src/unk_02024E64_c.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index 04c26f16..b64d165d 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -30,4 +30,9 @@ THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) { return FUN_02022634(sav2, 0xa); +} + +THUMB_FUNC void *FUN_02024ECC(struct SaveBlock2 *sav2) +{ + return SavArray_get(sav2, 0xa); } \ No newline at end of file -- cgit v1.2.3 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/src/unk_02024E64_c.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arm9/src') 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 From dbca3ebcabf9dae1844d8bf7712bd814b5facebb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 10:03:48 +0100 Subject: decomp FUN_02024EE8 --- arm9/src/unk_02024E64_c.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index 8831d772..114951eb 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -37,8 +37,13 @@ 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); +THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2) +{ + void *res = SavArray_get(sav2, 0xa); return res + (7 << 8); +} -} \ No newline at end of file +THUMB_FUNC u32 FUN_02024EE8(u32 param0) +{ + return param0 + 0x00000724; +} -- cgit v1.2.3 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/src/unk_02024E64_c.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'arm9/src') 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 From 17b47c39406338ff7c77f3662b3ad88fadb38e10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 10:12:56 +0100 Subject: decomp FUN_02024F0C --- arm9/src/unk_02024E64_c.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'arm9/src') diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c index 48e1821e..083735bd 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64_c.c @@ -52,4 +52,9 @@ THUMB_FUNC u32 FUN_02024EE8(u32 param0) THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str) { CopyStringToU16Array(str, buf + 0x392, 8); -} \ No newline at end of file +} + +THUMB_FUNC u32 FUN_02024F0C(u32 param0) +{ + return param0 + 0x734; +} -- cgit v1.2.3 From 841866478a047e1879804eeee93a2f6113fa5295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 11:15:23 +0100 Subject: cleanup --- arm9/src/save_arrays.c | 3 +-- arm9/src/script_buffers.c | 3 +-- arm9/src/trainer_data.c | 3 +-- arm9/src/unk_02024E64.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++ arm9/src/unk_02024E64_c.c | 60 --------------------------------------------- 5 files changed, 65 insertions(+), 66 deletions(-) create mode 100644 arm9/src/unk_02024E64.c delete mode 100644 arm9/src/unk_02024E64_c.c (limited to 'arm9/src') diff --git a/arm9/src/save_arrays.c b/arm9/src/save_arrays.c index 397f1f69..8520f2c1 100644 --- a/arm9/src/save_arrays.c +++ b/arm9/src/save_arrays.c @@ -14,10 +14,10 @@ #include "pokedex.h" #include "seal.h" #include "unk_020139D8.h" +#include "unk_02024E64.h" extern u32 FUN_0202AC20(void); extern u32 FUN_02034D7C(void); -extern u32 FUN_02024E64(void); extern u32 FUN_02034D80(void); extern u32 FUN_02025954(void); extern u32 FUN_02023AC8(void); @@ -39,7 +39,6 @@ extern u32 FUN_0202BE98(void); extern u32 FUN_0202C0E0(void); extern void FUN_0202AC28(void *); extern void FUN_02034D98(void *); -extern void FUN_02024E6C(void *); extern void FUN_02034D88(void *); extern void FUN_0202597C(void *); extern void FUN_02023AD8(void *); diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 431f63b4..293c0bac 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -11,11 +11,10 @@ #include "unk_0201B8B8.h" #include "trainer_data.h" #include "script_buffers.h" +#include "unk_02024E64.h" #pragma thumb on -extern void * FUN_02024EC0(struct SaveBlock2 * sav2); -extern u16 * FUN_02024EE8(void *); extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src); diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index 7af4b2ce..a797956c 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -6,11 +6,10 @@ #include "proto.h" #include "msgdata.h" #include "constants/trainer_classes.h" +#include "unk_02024E64.h" #pragma thumb on -extern void * FUN_02024EC0(struct SaveBlock2 *); -extern u16 * FUN_02024EE8(void *); // Loads all battle opponents, including multi-battle partner if exists. void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 * sav2, u32 heap_id) diff --git a/arm9/src/unk_02024E64.c b/arm9/src/unk_02024E64.c new file mode 100644 index 00000000..fc596418 --- /dev/null +++ b/arm9/src/unk_02024E64.c @@ -0,0 +1,62 @@ +#include "unk_02024E64.h" + +extern void FUN_020250A4(void *param0); +extern void FUN_02025484(void *param0); + +THUMB_FUNC u32 FUN_02024E64() +{ + return 0x74C; +} + +THUMB_FUNC void FUN_02024E6C(void *param0) +{ + MIi_CpuClearFast(0, param0, 0x74C); + + FUN_020250A4(param0); + + FUN_02025484(param0 + (7 << 8)); + + MIi_CpuClear16(0xFFFF, param0 + 0x724, 8); + MIi_CpuClear16(0xFFFF, param0 + 0x734, 0xb); +} + +THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) +{ + return SavArray_get(sav2, 0xa); +} + +THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) +{ + return FUN_02022634(sav2, 0xa); +} + +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); +} + +THUMB_FUNC u16 *FUN_02024EE8(void *buf) +{ + return buf + 0x724; +} + +THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str) +{ + CopyStringToU16Array(str, buf + 0x392, 8); +} + +THUMB_FUNC u16 *FUN_02024F0C(void *buf) +{ + return buf + 0x734; +} + +THUMB_FUNC void FUN_02024F18(u16 *buf, struct String *str) +{ + CopyStringToU16Array(str, buf + 0x39A, 0xb); +} diff --git a/arm9/src/unk_02024E64_c.c b/arm9/src/unk_02024E64_c.c deleted file mode 100644 index 083735bd..00000000 --- a/arm9/src/unk_02024E64_c.c +++ /dev/null @@ -1,60 +0,0 @@ -#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); - -THUMB_FUNC u32 FUN_02024E64() -{ - return 0x0000074C; -} - -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); -} - -THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) -{ - return SavArray_get(sav2, 0xa); -} - -THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2) -{ - return FUN_02022634(sav2, 0xa); -} - -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); -} - -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); -} - -THUMB_FUNC u32 FUN_02024F0C(u32 param0) -{ - return param0 + 0x734; -} -- cgit v1.2.3