From b80100f71232394f72f2a278ff30c78e46b3ffd4 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 17 Mar 2021 00:33:05 -0400 Subject: unk_02024E64: use a struct for storing information Also add a missing include guard and name a couple of functions. --- include/unk_02024E64.h | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/unk_02024E64.h b/include/unk_02024E64.h index b5cfaa6e..ed1bd447 100644 --- a/include/unk_02024E64.h +++ b/include/unk_02024E64.h @@ -1,15 +1,28 @@ +#ifndef POKEDIAMOND_UNK_02024E64_H +#define POKEDIAMOND_UNK_02024E64_H + #include "global.h" #include "MI_memory.h" #include "save_block_2.h" #include "string16.h" +struct UnkStruct_02024E64 { + u8 unk0[0xE][0x80]; + u8 unk700[0x24]; + u16 rival_name_buf[0x8]; + u16 unk734[0xB]; + u8 unk74A[2]; // might be padding +}; + THUMB_FUNC u32 FUN_02024E64(); -THUMB_FUNC void FUN_02024E6C(void *param0); -THUMB_FUNC void *FUN_02024EB4(struct SaveBlock2 *sav2); +THUMB_FUNC void FUN_02024E6C(struct UnkStruct_02024E64 *param0); +THUMB_FUNC struct UnkStruct_02024E64 *FUN_02024EB4(struct SaveBlock2 *sav2); THUMB_FUNC void *FUN_02024EC0(struct SaveBlock2 *sav2); -THUMB_FUNC void *FUN_02024ECC(struct SaveBlock2 *sav2); +THUMB_FUNC struct UnkStruct_02024E64 *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); +THUMB_FUNC u16 *GetRivalNamePtr(struct UnkStruct_02024E64 *unk); +THUMB_FUNC void RivalsNameToU16Array(struct UnkStruct_02024E64 *unk, struct String *str); +THUMB_FUNC u16 *FUN_02024F0C(struct UnkStruct_02024E64 *unk); +THUMB_FUNC void FUN_02024F18(struct UnkStruct_02024E64 *unk, struct String *str); + +#endif -- cgit v1.2.3