diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/unk_02008AA4.h | 24 | ||||
-rw-r--r-- | include/unk_02008DEC.h | 42 | ||||
-rw-r--r-- | include/unk_0200BB14.h | 77 |
3 files changed, 88 insertions, 55 deletions
diff --git a/include/unk_02008AA4.h b/include/unk_02008AA4.h index 448a7101..2884547d 100644 --- a/include/unk_02008AA4.h +++ b/include/unk_02008AA4.h @@ -31,20 +31,20 @@ void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, s32 param6, u32 param7, u32 param8, - u32 param9, - u32 param10, - u32 param11, - u32 param12, - u32 param13, - u32 param14); + struct UnkStruct1 *param9, + struct UnkStruct1 *param10, + struct UnkStruct1 *param11, + struct UnkStruct1 *param12, + struct UnkStruct1 *param13, + struct UnkStruct1 *param14); struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0, u32 param1, - u32 param2, - u32 param3, - u32 param4, - u32 param5, - u32 param6, - u32 param7); + struct UnkStruct1 *param2, + struct UnkStruct1 *param3, + struct UnkStruct1 *param4, + struct UnkStruct1 *param5, + struct UnkStruct1 *param6, + struct UnkStruct1 *param7); void FUN_02008C80(struct UnkStruct_02008AA4_1 *param0); u32 FUN_02008C9C(u32 param0, void *param1, u32 param2); void FUN_02008D04(u32 param0, u32 param1, u32 param2); diff --git a/include/unk_02008DEC.h b/include/unk_02008DEC.h index a3cdfc1a..99dc9579 100644 --- a/include/unk_02008DEC.h +++ b/include/unk_02008DEC.h @@ -1,4 +1,8 @@ +#ifndef POKEDIAMOND_UNK_02008DEC_H +#define POKEDIAMOND_UNK_02008DEC_H + #include "global.h" +#include "NNS_g2d.h" #include "filesystem.h" struct UnkStruct1_sub @@ -48,12 +52,36 @@ struct UnkStruct5 { struct UnkStruct1_sub **unk00; s32 unk04; + s32 unk08; +}; + +struct CharacterData_02008DEC +{ + NNSG2dCharacterData *chData; + u32 unk04; +}; + +struct PaletteData_02008DEC +{ + NNSG2dPaletteData *plttData; + u32 unk04; u32 unk08; }; +struct CellDataBank_02008DEC +{ + NNSG2dCellDataBank *cellBank; +}; + +struct AnimBank_02008DEC +{ + NNSG2dAnimBankData *bankData; +}; + struct UnkStruct1 *FUN_02008DEC(u32 param0, s32 param1, u32 param2); void FUN_02008E2C(struct UnkStruct1 *param0); -struct UnkStruct1_sub *FUN_02008E6C(struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, u32 param3); +struct UnkStruct1_sub *FUN_02008E6C( + struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, u32 param3); struct UnkStruct1_sub *FUN_02008F34(struct UnkStruct1 *param0, NarcId param1, s32 param2, @@ -144,12 +172,12 @@ struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0, s32 param4, u32 param5, u32 param6); -s32 FUN_020093A8(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2, u32 param3); +s32 FUN_020093A8(struct UnkStruct1 *param0, struct UnkStruct2 *param1, struct UnkStruct5 *param2, u32 param3); void FUN_020093DC(struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, s32 param3, - s32 *param4, + struct UnkStruct5 *param4, u32 param5); struct UnkStruct5 *FUN_02009424(s32 param0, u32 param1); void FUN_02009448(struct UnkStruct5 *param0); @@ -157,7 +185,7 @@ u32 FUN_0200945C(struct UnkStruct1 *param0, s32 param1); void FUN_02009474(struct UnkStruct1_sub *param0); void FUN_02009490(struct UnkStruct1 *param0, struct UnkStruct1_sub *param1); void FUN_020094C4(struct UnkStruct1 *param0); -struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, u32 param1); +struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, s32 param1); s32 FUN_02009530(struct UnkStruct1_sub *param0); u32 FUN_02009544(struct UnkStruct1_sub *param0); u32 FUN_0200955C(struct UnkStruct1_sub *param0); @@ -170,7 +198,7 @@ u32 FUN_020095E4(struct UnkStruct1_sub *param0); u32 FUN_02009610(struct UnkStruct1_sub *param0); void FUN_02009630(struct UnkStruct1_sub *param0, u32 param1); u32 FUN_0200965C(void); -u32 *FUN_02009660(u32 *param0, s32 param1); +struct UnkStruct2 *FUN_02009660(struct UnkStruct2 *param0, s32 param1); void FUN_02009668(u32 *param0, struct UnkStruct2 *param1, u32 param2); void FUN_020096B4(struct UnkStruct2 *param0); s32 FUN_020096CC(struct UnkStruct2 *param0); @@ -232,7 +260,7 @@ void FUN_02009BE8(struct UnkStruct1_sub *param0); void FUN_02009C0C(struct UnkStruct1_sub *param0); void FUN_02009C30(struct UnkStruct5 *param0); u32 FUN_02009C5C(struct UnkStruct1_sub *param0); -void FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1); +u32 FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1); void FUN_02009CDC(u32 param0); u32 FUN_02009CF0(struct UnkStruct1_sub *param0); void FUN_02009D34(struct UnkStruct5 *param0); @@ -243,3 +271,5 @@ void FUN_02009E04(struct UnkStruct1_sub *param0); void FUN_02009E28(struct UnkStruct5 *param0); u32 FUN_02009E54(struct UnkStruct1_sub *param0, u32 param1); s32 FUN_02009E88(struct UnkStruct1_sub *param0, u32 param1); + +#endif // POKEDIAMOND_UNK_02008DEC_H diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 04c6dcb0..20d4739d 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -2,6 +2,7 @@ #define POKEDIAMOND_UNK_0200BB14_H #include "global.h" +#include "unk_02008DEC.h" struct UnkStruct_0200BB14_1 { @@ -16,10 +17,10 @@ struct UnkStruct_0200BB14_2 { u32 unk00; struct UnkStruct_02008AA4_1 *unk04; - u32 *unk08; - u32 unk0c[6]; - u32 *unk24[6]; - u32 unk3c[6]; + struct UnkStruct2 *unk08; + struct UnkStruct1 *unk0c[6]; + struct UnkStruct5 *unk24[6]; + s32 unk3c[6]; s32 unk54; }; @@ -117,19 +118,19 @@ u32 FUN_0200BE74(u32 *param0, u32 param12, u32 param13); BOOL FUN_0200BF60( - struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); + struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, s32 *param2); BOOL FUN_0200C00C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, u32 param5, s32 param6); s32 FUN_0200C06C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, u32 param5, u32 param6, s32 param7); @@ -137,28 +138,28 @@ u8 FUN_0200C0DC(u32 param0, u32 param1, u32 *param2, struct UnkStruct_0200BB14_2 *param3, - u32 param4, - u32 param5, - u32 param6, + NarcId param4, + s32 param5, + BOOL param6, u32 param7, u32 param8, s32 param9); BOOL FUN_0200C124(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, s32 param5); BOOL FUN_0200C13C(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, s32 param5); struct UnkStruct_0200BB14_5 *FUN_0200C154( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); -u32 FUN_0200C334(u32 *param0, u32 param1); -u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2); +u32 FUN_0200C334(struct UnkStruct1 **param0, s32 param1); +s32 FUN_0200C344(struct UnkStruct1 **param0, s32 param1, u32 param2); BOOL FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1); BOOL FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1); BOOL FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1); @@ -167,15 +168,15 @@ void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14 void FUN_0200C3DC(u32 *param0); BOOL FUN_0200C404(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, u32 param5, s32 param6); -BOOL FUN_0200C474(u32 *param0, u32 param1); -BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2); -BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2); -BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2); +BOOL FUN_0200C474(struct UnkStruct5 *param0, struct UnkStruct1_sub *param1); +BOOL FUN_0200C4A8(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2); +BOOL FUN_0200C4F4(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2); +BOOL FUN_0200C548(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2); void FUN_0200C59C(u32 param0); void FUN_0200C5A8(u32 *param0); void FUN_0200C5B4(u32 *param0, u32 param1); @@ -233,20 +234,22 @@ void FUN_0200C904(u32 param0, u32 param1); void FUN_0200C90C(u32 *param0, u32 param1); BOOL FUN_0200C918(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, u32 param5, s32 param6); BOOL FUN_0200C978(u32 *param0, struct UnkStruct_0200BB14_2 *param1, - u32 param2, - u32 param3, - u32 param4, + NarcId param2, + s32 param3, + BOOL param4, u32 param5, s32 param6); -void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); -void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5); +void FUN_0200C9D8( + u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); +void FUN_0200CA0C( + u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); u32 FUN_0200CA40(u32 *param0); #endif // POKEDIAMOND_UNK_0200BB14_H |