diff options
| -rw-r--r-- | arm9/arm9.lsf | 1 | ||||
| -rw-r--r-- | arm9/asm/unk_02024E64.s | 24 | ||||
| -rw-r--r-- | arm9/global.inc | 9 | ||||
| -rw-r--r-- | arm9/src/save_arrays.c | 3 | ||||
| -rw-r--r-- | arm9/src/script_buffers.c | 3 | ||||
| -rw-r--r-- | arm9/src/trainer_data.c | 3 | ||||
| -rw-r--r-- | arm9/src/unk_02024E64.c (renamed from arm9/src/unk_02024E64_c.c) | 26 | ||||
| -rw-r--r-- | include/unk_02024E64.h | 15 |
8 files changed, 32 insertions, 52 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf index 9378c57e..b8accee4 100644 --- a/arm9/arm9.lsf +++ b/arm9/arm9.lsf @@ -89,7 +89,6 @@ Static arm9 Object unk_02023AC4.o Object daycare.o Object pokedex.o - Object unk_02024E64_c.o Object unk_02024E64.o Object options.o Object unk_020250A4.o diff --git a/arm9/asm/unk_02024E64.s b/arm9/asm/unk_02024E64.s deleted file mode 100644 index c24e5ea3..00000000 --- a/arm9/asm/unk_02024E64.s +++ /dev/null @@ -1,24 +0,0 @@ - .include "asm/macros.inc" - .include "global.inc" - - .text - - - - - - - - - thumb_func_start FUN_02024F18 -FUN_02024F18: ; 0x02024F18 - add r2, r0, #0x0 - add r0, r1, #0x0 - ldr r1, _02024F28 ; =0x00000734 - ldr r3, _02024F2C ; =CopyStringToU16Array - add r1, r2, r1 - mov r2, #0xb - bx r3 - nop -_02024F28: .word 0x00000734 -_02024F2C: .word CopyStringToU16Array diff --git a/arm9/global.inc b/arm9/global.inc index 44ae1ae6..d816d92a 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -8519,12 +8519,3 @@ .extern CARDi_InitCommon .extern MonNotFaintedOrEgg .extern CountAlivePokemon -.extern FUN_02024E64 -.extern FUN_02024E6C -.extern FUN_02024EB4 -.extern FUN_02024EC0 -.extern FUN_02024ECC -.extern FUN_02024ED8 -.extern FUN_02024EE8 -.extern FUN_02024EF4 -.extern FUN_02024F0C
\ No newline at end of file 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.c b/arm9/src/unk_02024E64.c index 083735bd..fc596418 100644 --- a/arm9/src/unk_02024E64_c.c +++ b/arm9/src/unk_02024E64.c @@ -1,26 +1,23 @@ -#include "global.h" -#include "MI_memory.h" -#include "save_block_2.h" -#include "string16.h" +#include "unk_02024E64.h" extern void FUN_020250A4(void *param0); extern void FUN_02025484(void *param0); THUMB_FUNC u32 FUN_02024E64() { - return 0x0000074C; + return 0x74C; } THUMB_FUNC void FUN_02024E6C(void *param0) { - MIi_CpuClearFast(0, param0, 0x0000074C); + MIi_CpuClearFast(0, param0, 0x74C); FUN_020250A4(param0); FUN_02025484(param0 + (7 << 8)); - MIi_CpuClear16(0x0000FFFF, param0 + 0x00000724, 8); - MIi_CpuClear16(0x0000FFFF, param0 + 0x00000734, 0xb); + MIi_CpuClear16(0xFFFF, param0 + 0x724, 8); + MIi_CpuClear16(0xFFFF, param0 + 0x734, 0xb); } THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2) @@ -44,9 +41,9 @@ THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2) return res + (7 << 8); } -THUMB_FUNC u32 FUN_02024EE8(u32 param0) +THUMB_FUNC u16 *FUN_02024EE8(void *buf) { - return param0 + 0x00000724; + return buf + 0x724; } THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str) @@ -54,7 +51,12 @@ THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str) CopyStringToU16Array(str, buf + 0x392, 8); } -THUMB_FUNC u32 FUN_02024F0C(u32 param0) +THUMB_FUNC u16 *FUN_02024F0C(void *buf) { - return param0 + 0x734; + return buf + 0x734; +} + +THUMB_FUNC void FUN_02024F18(u16 *buf, struct String *str) +{ + CopyStringToU16Array(str, buf + 0x39A, 0xb); } diff --git a/include/unk_02024E64.h b/include/unk_02024E64.h new file mode 100644 index 00000000..b5cfaa6e --- /dev/null +++ b/include/unk_02024E64.h @@ -0,0 +1,15 @@ +#include "global.h" +#include "MI_memory.h" +#include "save_block_2.h" +#include "string16.h" + +THUMB_FUNC u32 FUN_02024E64(); +THUMB_FUNC void FUN_02024E6C(void *param0); +THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2); +THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2); +THUMB_FUNC void *FUN_02024ECC(struct SaveBlock2 *sav2); +THUMB_FUNC void *FUN_02024ED8(struct SaveBlock2 *sav2); +THUMB_FUNC u16 *FUN_02024EE8(void *buf); +THUMB_FUNC void FUN_02024EF4(u16 *buf, struct String *str); +THUMB_FUNC u16 *FUN_02024F0C(void *buf); +THUMB_FUNC void FUN_02024F18(u16 *buf, struct String *str); |