diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/script.h | 3 | ||||
-rw-r--r-- | include/unk_0204639C.h | 12 | ||||
-rw-r--r-- | include/unk_0205FA2C.h | 14 |
3 files changed, 16 insertions, 13 deletions
diff --git a/include/script.h b/include/script.h index 9a7270c2..bb237523 100644 --- a/include/script.h +++ b/include/script.h @@ -28,7 +28,8 @@ struct UnkSavStruct80 u8 padding[0x8];
u32 unk08;
struct SaveBlock2 *saveBlock2; //0xC
- u8 padding2[0xC];
+ struct UnkStruct_0204639C *unk10;
+ u8 padding2[0x8];
u32 *mapId; //0x1C
u8 padding3[0x18];
u32 unk38;
diff --git a/include/unk_0204639C.h b/include/unk_0204639C.h index cff2241f..cebe192d 100644 --- a/include/unk_0204639C.h +++ b/include/unk_0204639C.h @@ -1,6 +1,8 @@ #ifndef GUARD_UNK_0204639C_H #define GUARD_UNK_0204639C_H +#include "script.h" + struct UnkStruct_0204639C; typedef BOOL (*UnkStruct_0204639C_cb)(struct UnkStruct_0204639C * ); @@ -13,18 +15,18 @@ struct UnkStruct_0204639C u32 * unkC; struct UnkStruct_0204639C * unk10; void * unk14; - struct UnkStruct_0204639C * unk18; + struct UnkSavStruct80 * unk18; u32 * unk1C; }; extern void LoadOverlay_MODULE_05(void *); -extern void FUN_020373D4(struct UnkStruct_0204639C *, u32, u32); +extern void FUN_020373D4(struct UnkSavStruct80 *, u32, u32); extern BOOL FUN_020373AC(void *); extern BOOL FUN_0203739C(void *); extern BOOL FUN_020373C4(void *); -struct UnkStruct_0204639C * FUN_0204639C(struct UnkStruct_0204639C * r5, UnkStruct_0204639C_cb r6, u32 * r7); -void FUN_020463CC(struct UnkStruct_0204639C * r5, UnkStruct_0204639C_cb r4, u32 * r6); +struct UnkStruct_0204639C * FUN_0204639C(struct UnkSavStruct80 * r5, UnkStruct_0204639C_cb r6, u32 * r7); +void FUN_020463CC(struct UnkSavStruct80 * r5, UnkStruct_0204639C_cb r4, u32 * r6); void FUN_020463EC(struct UnkStruct_0204639C * r4, UnkStruct_0204639C_cb r1, u32 * r2); void FUN_0204640C(struct UnkStruct_0204639C * r4, UnkStruct_0204639C_cb r1, u32 * r2); BOOL FUN_02046420(struct UnkStruct_0204639C * r5); @@ -37,6 +39,6 @@ void FUN_02046500(struct UnkStruct_0204639C * r6, u32 r5, u32 r4); u32 * FUN_0204652C(struct UnkStruct_0204639C * r0); u32 * FUN_02046530(struct UnkStruct_0204639C * r0); u32 FUN_02046534(struct UnkStruct_0204639C * r0); -struct UnkStruct_0204639C * FUN_02046528(struct UnkStruct_0204639C *); +struct UnkSavStruct80 * FUN_02046528(struct UnkStruct_0204639C *); #endif //GUARD_UNK_0204639C_H diff --git a/include/unk_0205FA2C.h b/include/unk_0205FA2C.h index e65507b7..19279a6c 100644 --- a/include/unk_0205FA2C.h +++ b/include/unk_0205FA2C.h @@ -81,13 +81,13 @@ struct UnkCallbackStruct2_0205FA2C }; THUMB_FUNC u32 FUN_0205FA2C( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1, u32 heap_id); THUMB_FUNC u32 FUN_0205FAD8( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC u32 FUN_0205FB34( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1, u32 heap_id); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1, u32 heap_id); THUMB_FUNC u32 FUN_0205FBC0( - struct UnkCallbackStruct1_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct1_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC int FUN_0205FBE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, void **param1, @@ -99,9 +99,9 @@ THUMB_FUNC void FUN_0205FC50(struct UnkStruct_0204639C *param0, u8 param7); THUMB_FUNC u32 FUN_0205FC9C( - struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC u32 FUN_0205FCC4( - struct UnkCallbackStruct2_0205FA2C *param0, struct UnkStruct_0204639C *param1); + struct UnkCallbackStruct2_0205FA2C *param0, struct UnkSavStruct80 *param1); THUMB_FUNC int FUN_0205FCE8(struct UnkStruct_0204639C *param0); THUMB_FUNC void FUN_0205FD38(struct UnkStruct_0204639C *param0, u16 param1, u16 param2, u16 param3); @@ -118,4 +118,4 @@ THUMB_FUNC u32 FUN_020600A0(struct SaveBlock2 *sav2); THUMB_FUNC u32 FUN_020600DC(struct SaveBlock2 *sav2); THUMB_FUNC BOOL FUN_02060144(u32 **param0); -#endif // POKEDIAMOND_UNK_0205FA2C_H
\ No newline at end of file +#endif // POKEDIAMOND_UNK_0205FA2C_H |