From 43b7ac4211e70ac0f2296ed4a230ec734c41b2e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 28 Aug 2021 23:31:33 +0200 Subject: fix warnings --- include/unk_02006D98.h | 165 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 165 insertions(+) create mode 100644 include/unk_02006D98.h (limited to 'include') diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h new file mode 100644 index 00000000..308e5dbc --- /dev/null +++ b/include/unk_02006D98.h @@ -0,0 +1,165 @@ +#include "global.h" +#include "NNS_g2d.h" +#include "mod63_021DB450.h" + +struct UnkStruct2_sub +{ + s8 unk0; + u8 unk1; +}; +struct UnkStruct2_sub2 +{ + u16 unk0_0 : 2; + u16 unk0_2 : 1; + u16 unk0_3 : 1; + u16 unk0_4 : 1; + u16 unk0_5 : 2; + s8 unk2; + u8 unk3; + s16 unk4; + s16 unk6; + s16 unk8; + s16 unka; +}; + +struct UnkStruct2 +{ + u32 unk00_0 : 1; + u32 unk00_1 : 6; + u32 unk00_7 : 1; + u32 unk00_8 : 1; + struct UnkStruct63_021DB49C unk04; + struct UnkStruct63_021DB49C unk14; + s16 unk24; + s16 unk26; + u32 unk28; + s16 unk2C; + s16 unk2E; + u32 unk30; + s16 unk34; + s16 unk36; + u16 unk38; + u16 unk3A; + u16 unk3C; + u16 unk3E; + s16 unk40; + s16 unk42; + u8 unk44; + u8 unk45; + u8 unk46; + u8 unk47; + u8 unk48; + u8 unk49; + u8 unk4A; + u8 unk4B; + u32 unk4C; + u32 unk50_0 : 5; + u32 unk50_5 : 5; + u32 unk50_a : 5; + u32 unk50_f : 5; + u32 unk50_14 : 5; + u32 unk50_19 : 5; + u32 unk50_1E : 2; + u32 unk54_0 : 1; + u32 unk54_1 : 1; + u32 unk54_2 : 5; + u32 unk54_7 : 2; + u32 unk54_9 : 1; + u32 unk54_A : 1; + u32 unk54_B : 1; + u32 unk54_C : 1; + u32 unk54_D : 4; + u8 unk58; + u8 unk59; + u8 unk5A; + u8 unk5B; + u8 unk5C[10]; + void (*unk68)(struct UnkStruct2 *, void *); + struct UnkStruct2_sub2 unk6C; + struct UnkStruct2_sub2 unk78; + struct UnkStruct2_sub unk84[10]; +}; + +struct UnkStruct1 +{ + struct UnkStruct2 unk000[4]; + NNSG2dImageProxy unk260; + NNSG2dImagePaletteProxy unk284; + u32 unk298; + u32 unk29C; + u32 unk2A0; + u32 unk2A4; + u32 unk2A8; + u8 *unk2AC; + u16 *unk2B0; + u16 *unk2B4; + NNSG2dCharacterData unk2B8; + NNSG2dPaletteData unk2D0; + u8 unk2E0; + u8 unk2E1; + u8 unk2E2; + u8 unk2E3; + u32 unk2E4; +}; + +struct UnkStruct4 +{ + u8 unk0; + u8 unk1; +}; + +struct UnkStruct1 *FUN_02006D98(u32 heap_id); +void FUN_02006ED4(struct UnkStruct1 *param0); +void FUN_020072E8(struct UnkStruct1 *param0); +void FUN_02007314(struct UnkStruct2 *param0); +void FUN_0200737C(struct UnkStruct2 *param0, struct UnkStruct2_sub *param1); +BOOL FUN_02007390(struct UnkStruct2 *param0); +struct UnkStruct2 *FUN_020073A0(struct UnkStruct1 *param0, + struct UnkStruct63_021DB49C *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + const void *param6, + void (*param7)(struct UnkStruct2 *, void *)); +struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0, + struct UnkStruct63_021DB49C *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6, + const void *param7, + void (*param8)(struct UnkStruct2 *, void *)); +void FUN_02007534(struct UnkStruct2 *param0); +void FUN_02007540(struct UnkStruct1 *param0); +void FUN_02007558(struct UnkStruct2 *param0, u32 param1, u32 param2); +u32 FUN_0200782C(struct UnkStruct2 *param0, u32 param1); +void FUN_020079E0(struct UnkStruct2 *param0, u32 param1, u32 param2); +void FUN_02007E40(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E68(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E98(struct UnkStruct1 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007EEC(struct UnkStruct2 *param0); +BOOL FUN_02007F20(struct UnkStruct2 *param0); +void FUN_02007F34(struct UnkStruct2 *param0, s32 param1); +void FUN_02007F48(struct UnkStruct2 *param0); +void FUN_02008010(u8 *param0, struct UnkStruct2_sub *param1); +s32 FUN_02008030(u8 *param0); +void FUN_020080D0(struct UnkStruct2 *param0); +void FUN_020080E0(struct UnkStruct2 *param0); +void FUN_0200813C(struct UnkStruct2 *param0); +void FUN_020081A8(struct UnkStruct1 *param0, u32 param1, u32 param2); +void FUN_020081B4(struct UnkStruct1 *param0, u32 param1, u32 param2); +u32 FUN_020081C0(u32 param0); +void FUN_020081C4(struct UnkStruct1 *param0); +void FUN_0200825C(struct UnkStruct1 *param0, u8 param1); +BOOL FUN_02008268(struct UnkStruct2 *param0); +void FUN_02008284(struct UnkStruct1 *param0, u32 param1); +void FUN_02008290(struct UnkStruct1 *param0, u32 param1); +void FUN_020082A8(struct UnkStruct1 *param0); +void FUN_020086F4(struct UnkStruct1 *param0); +u8 FUN_020088D8(u8 param0); +void FUN_020088EC(struct UnkStruct2 *param0, u8 *param1); +void FUN_02008904(u8 *param0, u32 param1, u32 param2); +u16 FUN_02008A54(u32 *param0); +void FUN_02008A74(u8 *param0); -- cgit v1.2.3 From 21748d0a9416d453d844ed1a95341c64d69e5091 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 29 Aug 2021 00:03:50 +0200 Subject: remove old externs --- include/unk_02006D98.h | 108 ++++++++++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 47 deletions(-) (limited to 'include') diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h index 308e5dbc..04661ebd 100644 --- a/include/unk_02006D98.h +++ b/include/unk_02006D98.h @@ -1,13 +1,24 @@ +#ifndef POKEDIAMOND_UNK_02006D98_H +#define POKEDIAMOND_UNK_02006D98_H + #include "global.h" #include "NNS_g2d.h" -#include "mod63_021DB450.h" +struct UnkStruct63_021DB49C +{ + u16 field_00; + u16 field_02; + u16 field_04; + u16 field_06; + u32 field_08; + u32 field_0C; +}; -struct UnkStruct2_sub +struct UnkStruct_02006D98_sub { s8 unk0; u8 unk1; }; -struct UnkStruct2_sub2 +struct UnkStruct_02006D98_sub2 { u16 unk0_0 : 2; u16 unk0_2 : 1; @@ -22,7 +33,7 @@ struct UnkStruct2_sub2 s16 unka; }; -struct UnkStruct2 +struct UnkStruct_02006D98_2 { u32 unk00_0 : 1; u32 unk00_1 : 6; @@ -74,15 +85,15 @@ struct UnkStruct2 u8 unk5A; u8 unk5B; u8 unk5C[10]; - void (*unk68)(struct UnkStruct2 *, void *); - struct UnkStruct2_sub2 unk6C; - struct UnkStruct2_sub2 unk78; - struct UnkStruct2_sub unk84[10]; + void (*unk68)(struct UnkStruct_02006D98_2 *, void *); + struct UnkStruct_02006D98_sub2 unk6C; + struct UnkStruct_02006D98_sub2 unk78; + struct UnkStruct_02006D98_sub unk84[10]; }; -struct UnkStruct1 +struct UnkStruct_02006D98 { - struct UnkStruct2 unk000[4]; + struct UnkStruct_02006D98_2 unk000[4]; NNSG2dImageProxy unk260; NNSG2dImagePaletteProxy unk284; u32 unk298; @@ -102,27 +113,27 @@ struct UnkStruct1 u32 unk2E4; }; -struct UnkStruct4 +struct UnkStruct_02006D98_3 { u8 unk0; u8 unk1; }; -struct UnkStruct1 *FUN_02006D98(u32 heap_id); -void FUN_02006ED4(struct UnkStruct1 *param0); -void FUN_020072E8(struct UnkStruct1 *param0); -void FUN_02007314(struct UnkStruct2 *param0); -void FUN_0200737C(struct UnkStruct2 *param0, struct UnkStruct2_sub *param1); -BOOL FUN_02007390(struct UnkStruct2 *param0); -struct UnkStruct2 *FUN_020073A0(struct UnkStruct1 *param0, +struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id); +void FUN_02006ED4(struct UnkStruct_02006D98 *param0); +void FUN_020072E8(struct UnkStruct_02006D98 *param0); +void FUN_02007314(struct UnkStruct_02006D98_2 *param0); +void FUN_0200737C(struct UnkStruct_02006D98_2 *param0, struct UnkStruct_02006D98_sub *param1); +BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0); +struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0, struct UnkStruct63_021DB49C *param1, u32 param2, u32 param3, u32 param4, u32 param5, const void *param6, - void (*param7)(struct UnkStruct2 *, void *)); -struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0, + void (*param7)(struct UnkStruct_02006D98_2 *, void *)); +struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0, struct UnkStruct63_021DB49C *param1, u32 param2, u32 param3, @@ -130,36 +141,39 @@ struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0, u32 param5, s32 param6, const void *param7, - void (*param8)(struct UnkStruct2 *, void *)); -void FUN_02007534(struct UnkStruct2 *param0); -void FUN_02007540(struct UnkStruct1 *param0); -void FUN_02007558(struct UnkStruct2 *param0, u32 param1, u32 param2); -u32 FUN_0200782C(struct UnkStruct2 *param0, u32 param1); -void FUN_020079E0(struct UnkStruct2 *param0, u32 param1, u32 param2); -void FUN_02007E40(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02007E68(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02007E98(struct UnkStruct1 *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02007EEC(struct UnkStruct2 *param0); -BOOL FUN_02007F20(struct UnkStruct2 *param0); -void FUN_02007F34(struct UnkStruct2 *param0, s32 param1); -void FUN_02007F48(struct UnkStruct2 *param0); -void FUN_02008010(u8 *param0, struct UnkStruct2_sub *param1); + void (*param8)(struct UnkStruct_02006D98_2 *, void *)); +void FUN_02007534(struct UnkStruct_02006D98_2 *param0); +void FUN_02007540(struct UnkStruct_02006D98 *param0); +void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2); +u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1); +void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2); +void FUN_02007E40(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E68(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E98(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0); +BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0); +void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1); +void FUN_02007F48(struct UnkStruct_02006D98_2 *param0); +void FUN_02008010(u8 *param0, struct UnkStruct_02006D98_sub *param1); s32 FUN_02008030(u8 *param0); -void FUN_020080D0(struct UnkStruct2 *param0); -void FUN_020080E0(struct UnkStruct2 *param0); -void FUN_0200813C(struct UnkStruct2 *param0); -void FUN_020081A8(struct UnkStruct1 *param0, u32 param1, u32 param2); -void FUN_020081B4(struct UnkStruct1 *param0, u32 param1, u32 param2); +void FUN_020080D0(struct UnkStruct_02006D98_2 *param0); +void FUN_020080E0(struct UnkStruct_02006D98_2 *param0); +void FUN_0200813C(struct UnkStruct_02006D98_2 *param0); +void FUN_020081A8(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2); +void FUN_020081B4(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2); u32 FUN_020081C0(u32 param0); -void FUN_020081C4(struct UnkStruct1 *param0); -void FUN_0200825C(struct UnkStruct1 *param0, u8 param1); -BOOL FUN_02008268(struct UnkStruct2 *param0); -void FUN_02008284(struct UnkStruct1 *param0, u32 param1); -void FUN_02008290(struct UnkStruct1 *param0, u32 param1); -void FUN_020082A8(struct UnkStruct1 *param0); -void FUN_020086F4(struct UnkStruct1 *param0); +void FUN_020081C4(struct UnkStruct_02006D98 *param0); +void FUN_0200825C(struct UnkStruct_02006D98 *param0, u8 param1); +BOOL FUN_02008268(struct UnkStruct_02006D98_2 *param0); +void FUN_02008284(struct UnkStruct_02006D98 *param0, u32 param1); +void FUN_02008290(struct UnkStruct_02006D98 *param0, u32 param1); +void FUN_020082A8(struct UnkStruct_02006D98 *param0); +void FUN_020086F4(struct UnkStruct_02006D98 *param0); u8 FUN_020088D8(u8 param0); -void FUN_020088EC(struct UnkStruct2 *param0, u8 *param1); +void FUN_020088EC(struct UnkStruct_02006D98_2 *param0, u8 *param1); void FUN_02008904(u8 *param0, u32 param1, u32 param2); u16 FUN_02008A54(u32 *param0); void FUN_02008A74(u8 *param0); + + +#endif // POKEDIAMOND_UNK_02006D98_H -- cgit v1.2.3 From 4e4192cd7007d16cefe00facbc7b721353c94f60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 31 Aug 2021 08:30:23 +0200 Subject: style fixes --- include/unk_02006D98.h | 57 ++++++++++++++++++++++---------------------------- 1 file changed, 25 insertions(+), 32 deletions(-) (limited to 'include') diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h index 04661ebd..fbb8c2c7 100644 --- a/include/unk_02006D98.h +++ b/include/unk_02006D98.h @@ -1,10 +1,9 @@ #ifndef POKEDIAMOND_UNK_02006D98_H #define POKEDIAMOND_UNK_02006D98_H -#include "global.h" #include "NNS_g2d.h" -struct UnkStruct63_021DB49C -{ +#include "global.h" +struct UnkStruct_02006D98_4 { u16 field_00; u16 field_02; u16 field_04; @@ -13,13 +12,11 @@ struct UnkStruct63_021DB49C u32 field_0C; }; -struct UnkStruct_02006D98_sub -{ +struct UnkStruct_02006D98_sub { s8 unk0; u8 unk1; }; -struct UnkStruct_02006D98_sub2 -{ +struct UnkStruct_02006D98_sub2 { u16 unk0_0 : 2; u16 unk0_2 : 1; u16 unk0_3 : 1; @@ -33,14 +30,13 @@ struct UnkStruct_02006D98_sub2 s16 unka; }; -struct UnkStruct_02006D98_2 -{ +struct UnkStruct_02006D98_2 { u32 unk00_0 : 1; u32 unk00_1 : 6; u32 unk00_7 : 1; u32 unk00_8 : 1; - struct UnkStruct63_021DB49C unk04; - struct UnkStruct63_021DB49C unk14; + struct UnkStruct_02006D98_4 unk04; + struct UnkStruct_02006D98_4 unk14; s16 unk24; s16 unk26; u32 unk28; @@ -91,8 +87,7 @@ struct UnkStruct_02006D98_2 struct UnkStruct_02006D98_sub unk84[10]; }; -struct UnkStruct_02006D98 -{ +struct UnkStruct_02006D98 { struct UnkStruct_02006D98_2 unk000[4]; NNSG2dImageProxy unk260; NNSG2dImagePaletteProxy unk284; @@ -113,8 +108,7 @@ struct UnkStruct_02006D98 u32 unk2E4; }; -struct UnkStruct_02006D98_3 -{ +struct UnkStruct_02006D98_3 { u8 unk0; u8 unk1; }; @@ -126,22 +120,22 @@ void FUN_02007314(struct UnkStruct_02006D98_2 *param0); void FUN_0200737C(struct UnkStruct_02006D98_2 *param0, struct UnkStruct_02006D98_sub *param1); BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0); struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0, - struct UnkStruct63_021DB49C *param1, - u32 param2, - u32 param3, - u32 param4, - u32 param5, - const void *param6, - void (*param7)(struct UnkStruct_02006D98_2 *, void *)); + struct UnkStruct_02006D98_4 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + const void *param6, + void (*param7)(struct UnkStruct_02006D98_2 *, void *)); struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0, - struct UnkStruct63_021DB49C *param1, - u32 param2, - u32 param3, - u32 param4, - u32 param5, - s32 param6, - const void *param7, - void (*param8)(struct UnkStruct_02006D98_2 *, void *)); + struct UnkStruct_02006D98_4 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6, + const void *param7, + void (*param8)(struct UnkStruct_02006D98_2 *, void *)); void FUN_02007534(struct UnkStruct_02006D98_2 *param0); void FUN_02007540(struct UnkStruct_02006D98 *param0); void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2); @@ -175,5 +169,4 @@ void FUN_02008904(u8 *param0, u32 param1, u32 param2); u16 FUN_02008A54(u32 *param0); void FUN_02008A74(u8 *param0); - -#endif // POKEDIAMOND_UNK_02006D98_H +#endif // POKEDIAMOND_UNK_02006D98_H -- cgit v1.2.3 From 1a63367f68ef1576162f97155ce426d091cb4395 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Fri, 3 Sep 2021 19:59:32 +0200 Subject: fix format --- include/unk_02006D98.h | 61 +++++++++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 26 deletions(-) (limited to 'include') diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h index fbb8c2c7..c20bcea1 100644 --- a/include/unk_02006D98.h +++ b/include/unk_02006D98.h @@ -1,9 +1,10 @@ #ifndef POKEDIAMOND_UNK_02006D98_H #define POKEDIAMOND_UNK_02006D98_H -#include "NNS_g2d.h" #include "global.h" -struct UnkStruct_02006D98_4 { +#include "NNS_g2d.h" +struct UnkStruct_02006D98_4 +{ u16 field_00; u16 field_02; u16 field_04; @@ -12,11 +13,13 @@ struct UnkStruct_02006D98_4 { u32 field_0C; }; -struct UnkStruct_02006D98_sub { +struct UnkStruct_02006D98_sub +{ s8 unk0; u8 unk1; }; -struct UnkStruct_02006D98_sub2 { +struct UnkStruct_02006D98_sub2 +{ u16 unk0_0 : 2; u16 unk0_2 : 1; u16 unk0_3 : 1; @@ -30,7 +33,8 @@ struct UnkStruct_02006D98_sub2 { s16 unka; }; -struct UnkStruct_02006D98_2 { +struct UnkStruct_02006D98_2 +{ u32 unk00_0 : 1; u32 unk00_1 : 6; u32 unk00_7 : 1; @@ -87,7 +91,8 @@ struct UnkStruct_02006D98_2 { struct UnkStruct_02006D98_sub unk84[10]; }; -struct UnkStruct_02006D98 { +struct UnkStruct_02006D98 +{ struct UnkStruct_02006D98_2 unk000[4]; NNSG2dImageProxy unk260; NNSG2dImagePaletteProxy unk284; @@ -108,7 +113,8 @@ struct UnkStruct_02006D98 { u32 unk2E4; }; -struct UnkStruct_02006D98_3 { +struct UnkStruct_02006D98_3 +{ u8 unk0; u8 unk1; }; @@ -120,30 +126,33 @@ void FUN_02007314(struct UnkStruct_02006D98_2 *param0); void FUN_0200737C(struct UnkStruct_02006D98_2 *param0, struct UnkStruct_02006D98_sub *param1); BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0); struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0, - struct UnkStruct_02006D98_4 *param1, - u32 param2, - u32 param3, - u32 param4, - u32 param5, - const void *param6, - void (*param7)(struct UnkStruct_02006D98_2 *, void *)); + struct UnkStruct_02006D98_4 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + const void *param6, + void (*param7)(struct UnkStruct_02006D98_2 *, void *)); struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0, - struct UnkStruct_02006D98_4 *param1, - u32 param2, - u32 param3, - u32 param4, - u32 param5, - s32 param6, - const void *param7, - void (*param8)(struct UnkStruct_02006D98_2 *, void *)); + struct UnkStruct_02006D98_4 *param1, + u32 param2, + u32 param3, + u32 param4, + u32 param5, + s32 param6, + const void *param7, + void (*param8)(struct UnkStruct_02006D98_2 *, void *)); void FUN_02007534(struct UnkStruct_02006D98_2 *param0); void FUN_02007540(struct UnkStruct_02006D98 *param0); void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2); u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1); void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2); -void FUN_02007E40(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02007E68(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); -void FUN_02007E98(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E40( + struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E68( + struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4); +void FUN_02007E98( + struct UnkStruct_02006D98 *param0, u32 param1, u32 param2, u32 param3, u32 param4); void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0); BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0); void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1); @@ -169,4 +178,4 @@ void FUN_02008904(u8 *param0, u32 param1, u32 param2); u16 FUN_02008A54(u32 *param0); void FUN_02008A74(u8 *param0); -#endif // POKEDIAMOND_UNK_02006D98_H +#endif // POKEDIAMOND_UNK_02006D98_H -- cgit v1.2.3 From 070f4b63d2c14d76316f181cde1dabfa7f63c0b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sat, 11 Sep 2021 09:29:21 +0200 Subject: fix remaining nonmatchings --- include/unk_02006D98.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unk_02006D98.h b/include/unk_02006D98.h index c20bcea1..42ed8217 100644 --- a/include/unk_02006D98.h +++ b/include/unk_02006D98.h @@ -119,6 +119,17 @@ struct UnkStruct_02006D98_3 u8 unk1; }; + +struct UnkStruct_02006D98_5 +{ + u8 unk00; + u8 unk01; + u8 unk02; + u8 unk03; + u8 unk04[10]; + struct UnkStruct_02006D98_sub *unk10; +}; + struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id); void FUN_02006ED4(struct UnkStruct_02006D98 *param0); void FUN_020072E8(struct UnkStruct_02006D98 *param0); @@ -157,8 +168,8 @@ void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0); BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0); void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1); void FUN_02007F48(struct UnkStruct_02006D98_2 *param0); -void FUN_02008010(u8 *param0, struct UnkStruct_02006D98_sub *param1); -s32 FUN_02008030(u8 *param0); +void FUN_02008010(struct UnkStruct_02006D98_5 *param0, struct UnkStruct_02006D98_sub *param1); +s32 FUN_02008030(struct UnkStruct_02006D98_5 *param0); void FUN_020080D0(struct UnkStruct_02006D98_2 *param0); void FUN_020080E0(struct UnkStruct_02006D98_2 *param0); void FUN_0200813C(struct UnkStruct_02006D98_2 *param0); -- cgit v1.2.3