diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-03-17 18:31:43 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-17 18:31:43 +0000 |
| commit | 941451f6408b8f92f9e7f5f3d6650f1b2ad2293d (patch) | |
| tree | f053b5f82d730ac3244cd62113be8b1c0d33e8fc /include | |
| parent | 075eeac194c016714f94fb4af83194308684c368 (diff) | |
| parent | 338065739eebcc0c9f13b864417462eeb06ac241 (diff) | |
Merge pull request #334 from tgsm/02024E64-struct
unk_02024E64: use a struct for storing information
Diffstat (limited to 'include')
| -rw-r--r-- | include/unk_02024E64.h | 27 |
1 files changed, 20 insertions, 7 deletions
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 |