diff options
author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-12 00:34:18 +0200 |
---|---|---|
committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-08-12 00:34:18 +0200 |
commit | 5ded23bcd3e68fa316c46b37266047ab28d08a2d (patch) | |
tree | 62f857d4b79c53b7a40c54c618aff5721a960480 | |
parent | e3766102b2132d09de4368f0be4f3898c263c9b7 (diff) |
global struct names
-rw-r--r-- | arm9/src/unk_02008AA4.c | 36 | ||||
-rw-r--r-- | arm9/src/unk_02008DEC.c | 222 | ||||
-rw-r--r-- | arm9/src/unk_0200BB14.c | 34 | ||||
-rw-r--r-- | include/unk_02008AA4.h | 24 | ||||
-rw-r--r-- | include/unk_02008DEC.h | 178 | ||||
-rw-r--r-- | include/unk_0200BB14.h | 22 |
6 files changed, 258 insertions, 258 deletions
diff --git a/arm9/src/unk_02008AA4.c b/arm9/src/unk_02008AA4.c index 4ddb6995..1cabb887 100644 --- a/arm9/src/unk_02008AA4.c +++ b/arm9/src/unk_02008AA4.c @@ -21,20 +21,20 @@ THUMB_FUNC void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, s32 param6, u32 param7, u32 param8, - struct UnkStruct1 *param9, - struct UnkStruct1 *param10, - struct UnkStruct1 *param11, - struct UnkStruct1 *param12, - struct UnkStruct1 *param13, - struct UnkStruct1 *param14) + struct UnkStruct_02008DEC_1 *param9, + struct UnkStruct_02008DEC_1 *param10, + struct UnkStruct_02008DEC_1 *param11, + struct UnkStruct_02008DEC_1 *param12, + struct UnkStruct_02008DEC_1 *param13, + struct UnkStruct_02008DEC_1 *param14) { - struct UnkStruct1_sub *r7; - struct UnkStruct1_sub *st14; - struct UnkStruct1_sub *st10; + struct UnkStruct_02008DEC_sub *r7; + struct UnkStruct_02008DEC_sub *st14; + struct UnkStruct_02008DEC_sub *st10; - struct UnkStruct1_sub *stc = NULL; - struct UnkStruct1_sub *r4 = NULL; - struct UnkStruct1_sub *st8 = NULL; + struct UnkStruct_02008DEC_sub *stc = NULL; + struct UnkStruct_02008DEC_sub *r4 = NULL; + struct UnkStruct_02008DEC_sub *st8 = NULL; GF_ASSERT(param9); GF_ASSERT(param10); @@ -116,12 +116,12 @@ THUMB_FUNC void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0, THUMB_FUNC struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0, u32 param1, - struct UnkStruct1 *param2, - struct UnkStruct1 *param3, - struct UnkStruct1 *param4, - struct UnkStruct1 *param5, - struct UnkStruct1 *param6, - struct UnkStruct1 *param7) + struct UnkStruct_02008DEC_1 *param2, + struct UnkStruct_02008DEC_1 *param3, + struct UnkStruct_02008DEC_1 *param4, + struct UnkStruct_02008DEC_1 *param5, + struct UnkStruct_02008DEC_1 *param6, + struct UnkStruct_02008DEC_1 *param7) { s32 r4 = 0; diff --git a/arm9/src/unk_02008DEC.c b/arm9/src/unk_02008DEC.c index 76e32b63..4467a03d 100644 --- a/arm9/src/unk_02008DEC.c +++ b/arm9/src/unk_02008DEC.c @@ -31,12 +31,12 @@ extern u32 FUN_0201E258(s32, u32); extern u32 FUN_0201E230(s32); extern s32 NNS_G2dGetImagePaletteLocation(u32, u32); -THUMB_FUNC struct UnkStruct1 *FUN_02008DEC(u32 param0, s32 param1, u32 heap_id) +THUMB_FUNC struct UnkStruct_02008DEC_1 *FUN_02008DEC(u32 param0, s32 param1, u32 heap_id) { - struct UnkStruct1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct1)); + struct UnkStruct_02008DEC_1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02008DEC_1)); ptr->unk00 = FUN_02020C44(param0, heap_id); - ptr->unk04 = AllocFromHeap(heap_id, param0 * sizeof(struct UnkStruct1_sub)); - memset(ptr->unk04, 0, param0 * sizeof(struct UnkStruct1_sub)); + ptr->unk04 = AllocFromHeap(heap_id, param0 * sizeof(struct UnkStruct_02008DEC_sub)); + memset(ptr->unk04, 0, param0 * sizeof(struct UnkStruct_02008DEC_sub)); ptr->unk08 = (s32)param0; ptr->unk0C = 0; ptr->unk10 = param1; @@ -44,7 +44,7 @@ THUMB_FUNC struct UnkStruct1 *FUN_02008DEC(u32 param0, s32 param1, u32 heap_id) return ptr; } -THUMB_FUNC void FUN_02008E2C(struct UnkStruct1 *param0) +THUMB_FUNC void FUN_02008E2C(struct UnkStruct_02008DEC_1 *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk00); @@ -61,20 +61,20 @@ THUMB_FUNC void FUN_02008E2C(struct UnkStruct1 *param0) FreeToHeap(param0); } -THUMB_FUNC struct UnkStruct1_sub *FUN_02008E6C( - struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, u32 param3) +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008E6C( + struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, u32 param3) { GF_ASSERT(param0); GF_ASSERT(param1); GF_ASSERT(param1->unk04 > param2); GF_ASSERT(param0->unk10 == param1->unk08); - struct UnkStruct1_sub *st1c = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *st1c = FUN_020097D0(param0); GF_ASSERT(st1c); if (param1->unk0C == 0) { - struct UnkStruct3 *r6 = &((struct UnkStruct3 *)param1->unk00)[param2]; + struct UnkStruct_02008DEC_3 *r6 = &((struct UnkStruct_02008DEC_3 *)param1->unk00)[param2]; GF_ASSERT(FUN_0200945C(param0, r6->unk00) == 1); FUN_0200994C( @@ -82,7 +82,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008E6C( } else { - struct UnkStruct4 *r6 = &((struct UnkStruct4 *)param1->unk00)[param2]; + struct UnkStruct_02008DEC_4 *r6 = &((struct UnkStruct_02008DEC_4 *)param1->unk00)[param2]; GF_ASSERT(FUN_0200945C(param0, r6->unk0C) == 1); FUN_02009978(param0, @@ -103,7 +103,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008E6C( return st1c; } -THUMB_FUNC struct UnkStruct1_sub *FUN_02008F34(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F34(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -114,7 +114,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008F34(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, param6, FALSE); @@ -123,7 +123,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008F34(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_02008F90(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008F90(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -135,7 +135,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008F90(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_02009978(param0, r6, param1, param2, param3, param4, param5, 0, 0, param6, param7); @@ -144,7 +144,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008F90(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_02008FEC(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02008FEC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -156,7 +156,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008FEC(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, param7, FALSE); @@ -165,7 +165,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02008FEC(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_0200904C(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200904C(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -178,7 +178,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_0200904C(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_02009978(param0, r6, param1, param2, param3, param4, param5, param6, 1, param7, param8); @@ -187,7 +187,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_0200904C(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_020090AC(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020090AC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -197,7 +197,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020090AC(struct UnkStruct1 *param0, { GF_ASSERT(param0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_02009978(param0, r6, param1, param2, param3, param4, 0, 0, param5, param6, FALSE); @@ -206,8 +206,8 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020090AC(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC void FUN_020090FC(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +THUMB_FUNC void FUN_020090FC(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, @@ -225,8 +225,8 @@ THUMB_FUNC void FUN_020090FC(struct UnkStruct1 *param0, FUN_02009978(param0, param1, param2, param3, param4, r6, r7, 0, 0, param5, FALSE); } -THUMB_FUNC void FUN_02009168(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +THUMB_FUNC void FUN_02009168(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, @@ -245,7 +245,7 @@ THUMB_FUNC void FUN_02009168(struct UnkStruct1 *param0, FUN_02009978(param0, param1, param2, param3, param4, r6, r7, st24, 1, param5, 0); } -THUMB_FUNC struct UnkStruct1_sub *FUN_020091E0(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020091E0(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -256,7 +256,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020091E0(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, param6, 0); @@ -265,7 +265,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020091E0(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_0200923C(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_0200923C(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -277,7 +277,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_0200923C(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_020099B0(param0, r6, param1, param2, param3, param4, param5, 0, 0, param6, param7); @@ -286,7 +286,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_0200923C(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_02009298(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009298(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -298,7 +298,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02009298(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, param7, 0); @@ -307,7 +307,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02009298(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_020092F8(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020092F8(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -320,7 +320,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020092F8(struct UnkStruct1 *param0, GF_ASSERT(param0); GF_ASSERT(param0->unk10 == 1); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_020099B0(param0, r6, param1, param2, param3, param4, param5, param6, 1, param7, param8); @@ -329,7 +329,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020092F8(struct UnkStruct1 *param0, return r6; } -THUMB_FUNC struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0, +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_02009358(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -339,7 +339,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0, { GF_ASSERT(param0); - struct UnkStruct1_sub *r6 = FUN_020097D0(param0); + struct UnkStruct_02008DEC_sub *r6 = FUN_020097D0(param0); GF_ASSERT(r6); FUN_020099B0(param0, r6, param1, param2, param3, param4, 0, 0, param5, param6, 0); @@ -349,7 +349,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0, } THUMB_FUNC s32 FUN_020093A8( - struct UnkStruct1 *param0, struct UnkStruct2 *param1, struct UnkStruct5 *param2, u32 param3) + struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, u32 param3) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -359,16 +359,16 @@ THUMB_FUNC s32 FUN_020093A8( return param1->unk04; } -THUMB_FUNC void FUN_020093DC(struct UnkStruct1 *param0, - struct UnkStruct2 *param1, +THUMB_FUNC void FUN_020093DC(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_2 *param1, s32 param2, s32 param3, - struct UnkStruct5 *param4, + struct UnkStruct_02008DEC_5 *param4, u32 param5) { for (int r5 = param2; r5 < param2 + param3; r5++) { - struct UnkStruct1_sub *r0 = FUN_02008E6C(param0, param1, r5, param5); + struct UnkStruct_02008DEC_sub *r0 = FUN_02008E6C(param0, param1, r5, param5); if (param4 != NULL && param4->unk04 > param4->unk08) { @@ -378,29 +378,29 @@ THUMB_FUNC void FUN_020093DC(struct UnkStruct1 *param0, } } -THUMB_FUNC struct UnkStruct5 *FUN_02009424(s32 param0, u32 param1) +THUMB_FUNC struct UnkStruct_02008DEC_5 *FUN_02009424(s32 param0, u32 param1) { - struct UnkStruct5 *r4 = AllocFromHeap(param1, sizeof(struct UnkStruct5)); - r4->unk00 = AllocFromHeap(param1, param0 * sizeof(struct UnkStruct1_sub *)); + struct UnkStruct_02008DEC_5 *r4 = AllocFromHeap(param1, sizeof(struct UnkStruct_02008DEC_5)); + r4->unk00 = AllocFromHeap(param1, param0 * sizeof(struct UnkStruct_02008DEC_sub *)); r4->unk04 = param0; r4->unk08 = 0; return r4; } -THUMB_FUNC void FUN_02009448(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009448(struct UnkStruct_02008DEC_5 *param0) { FreeToHeap(param0->unk00); FreeToHeap(param0); } -THUMB_FUNC u32 FUN_0200945C(struct UnkStruct1 *param0, s32 param1) +THUMB_FUNC u32 FUN_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1) { GF_ASSERT(param0); return FUN_02020CB0(param0->unk00, param1); } -THUMB_FUNC void FUN_02009474(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009474(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -408,7 +408,7 @@ THUMB_FUNC void FUN_02009474(struct UnkStruct1_sub *param0) FUN_02020E1C(param0->unk00, 0); } -THUMB_FUNC void FUN_02009490(struct UnkStruct1 *param0, struct UnkStruct1_sub *param1) +THUMB_FUNC void FUN_02009490(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04); @@ -419,7 +419,7 @@ THUMB_FUNC void FUN_02009490(struct UnkStruct1 *param0, struct UnkStruct1_sub *p param0->unk0C--; } -THUMB_FUNC void FUN_020094C4(struct UnkStruct1 *param0) +THUMB_FUNC void FUN_020094C4(struct UnkStruct_02008DEC_1 *param0) { for (int i = 0; i < param0->unk08; i++) { @@ -430,7 +430,7 @@ THUMB_FUNC void FUN_020094C4(struct UnkStruct1 *param0) } } -THUMB_FUNC struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, s32 param1) +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020094F0(struct UnkStruct_02008DEC_1 *param0, s32 param1) { GF_ASSERT(param0); @@ -449,56 +449,56 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, s32 pa return NULL; } -THUMB_FUNC s32 FUN_02009530(struct UnkStruct1_sub *param0) +THUMB_FUNC s32 FUN_02009530(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); return FUN_02020E38(param0->unk00); } -THUMB_FUNC u32 FUN_02009544(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009544(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 0); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_0200955C(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_0200955C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 1); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_02009574(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009574(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 2); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_0200958C(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_0200958C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 3); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095A4(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_020095A4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 4); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095BC(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_020095BC(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0->unk04 == 5); return *FUN_02009934(param0); } -THUMB_FUNC u32 FUN_020095D4(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_020095D4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); return param0->unk04; } -THUMB_FUNC u32 FUN_020095E4(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_020095E4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -514,7 +514,7 @@ THUMB_FUNC u32 FUN_020095E4(struct UnkStruct1_sub *param0) return 0; } -THUMB_FUNC u32 FUN_02009610(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009610(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); @@ -526,7 +526,7 @@ THUMB_FUNC u32 FUN_02009610(struct UnkStruct1_sub *param0) return 0; } -THUMB_FUNC void FUN_02009630(struct UnkStruct1_sub *param0, u32 param1) +THUMB_FUNC void FUN_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1) { GF_ASSERT(param0); @@ -545,24 +545,24 @@ THUMB_FUNC u32 FUN_0200965C(void) return 16; } -THUMB_FUNC struct UnkStruct2 *FUN_02009660(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC struct UnkStruct_02008DEC_2 *FUN_02009660(struct UnkStruct_02008DEC_2 *param0, s32 param1) { return ¶m0[param1]; } -THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct2 *param1, u32 param2) +THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, u32 param2) { GF_ASSERT(param1); param1->unk08 = param0[0]; param1->unk0C = 1; - param1->unk04 = FUN_020099E8((struct UnkStruct4 *)(param0 + 1)); + param1->unk04 = FUN_020099E8((struct UnkStruct_02008DEC_4 *)(param0 + 1)); void *ptr; if (param1->unk04 > 0) { - ptr = AllocFromHeap(param2, param1->unk04 * sizeof(struct UnkStruct4)); + ptr = AllocFromHeap(param2, param1->unk04 * sizeof(struct UnkStruct_02008DEC_4)); } else { @@ -574,11 +574,11 @@ THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct2 *param1, u32 param2) void *r0 = *((void *volatile *)param1); if (r0 != NULL) { - memcpy(r0, param0 + 1, param1->unk04 * sizeof(struct UnkStruct4)); + memcpy(r0, param0 + 1, param1->unk04 * sizeof(struct UnkStruct_02008DEC_4)); } } -THUMB_FUNC void FUN_020096B4(struct UnkStruct2 *param0) +THUMB_FUNC void FUN_020096B4(struct UnkStruct_02008DEC_2 *param0) { if (param0->unk00) { @@ -588,27 +588,27 @@ THUMB_FUNC void FUN_020096B4(struct UnkStruct2 *param0) param0->unk04 = 0; } -THUMB_FUNC s32 FUN_020096CC(struct UnkStruct2 *param0) +THUMB_FUNC s32 FUN_020096CC(struct UnkStruct_02008DEC_2 *param0) { GF_ASSERT(param0); return param0->unk04; } -THUMB_FUNC s32 FUN_020096DC(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC s32 FUN_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); if (param0->unk0C == 0) { - return ((struct UnkStruct3 *)param0->unk00)[param1].unk00; + return ((struct UnkStruct_02008DEC_3 *)param0->unk00)[param1].unk00; } - return ((struct UnkStruct4 *)param0->unk00)[param1].unk0C; + return ((struct UnkStruct_02008DEC_4 *)param0->unk00)[param1].unk0C; } -THUMB_FUNC s32 FUN_02009710(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC s32 FUN_02009710(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -616,14 +616,14 @@ THUMB_FUNC s32 FUN_02009710(struct UnkStruct2 *param0, s32 param1) s32 r6; if (param0->unk0C == 1) { - r6 = ((struct UnkStruct4 *)param0->unk00)[param1].unk04; + r6 = ((struct UnkStruct_02008DEC_4 *)param0->unk00)[param1].unk04; } // oops, UB here return r6; } -THUMB_FUNC BOOL FUN_0200973C(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC BOOL FUN_0200973C(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); @@ -631,40 +631,40 @@ THUMB_FUNC BOOL FUN_0200973C(struct UnkStruct2 *param0, s32 param1) BOOL r6; if (param0->unk0C == 1) { - r6 = ((struct UnkStruct4 *)param0->unk00)[param1].unk08; + r6 = ((struct UnkStruct_02008DEC_4 *)param0->unk00)[param1].unk08; } // oops, UB here return r6; } -THUMB_FUNC u32 FUN_02009768(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC u32 FUN_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); if (param0->unk0C == 0) { - return ((struct UnkStruct3 *)param0->unk00)[param1].unk44; + return ((struct UnkStruct_02008DEC_3 *)param0->unk00)[param1].unk44; } - return ((struct UnkStruct4 *)param0->unk00)[param1].unk10; + return ((struct UnkStruct_02008DEC_4 *)param0->unk00)[param1].unk10; } -THUMB_FUNC u32 FUN_0200979C(struct UnkStruct2 *param0, s32 param1) +THUMB_FUNC u32 FUN_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1) { GF_ASSERT(param0); GF_ASSERT(param0->unk04 > param1); if (param0->unk0C == 0) { - return ((struct UnkStruct3 *)param0->unk00)[param1].unk48; + return ((struct UnkStruct_02008DEC_3 *)param0->unk00)[param1].unk48; } - return ((struct UnkStruct4 *)param0->unk00)[param1].unk14; + return ((struct UnkStruct_02008DEC_4 *)param0->unk00)[param1].unk14; } -THUMB_FUNC struct UnkStruct1_sub *FUN_020097D0(struct UnkStruct1 *param0) +THUMB_FUNC struct UnkStruct_02008DEC_sub *FUN_020097D0(struct UnkStruct_02008DEC_1 *param0) { for (int i = 0; i < param0->unk08; i++) { @@ -678,7 +678,7 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020097D0(struct UnkStruct1 *param0) } THUMB_FUNC void FUN_020097FC( - struct UnkStruct1_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4) + struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4) { void *r0 = FUN_02020E0C(param0->unk00); @@ -764,7 +764,7 @@ THUMB_FUNC void *FUN_02009904(void *param0, u32 param1) return ptr; } -THUMB_FUNC void FUN_02009920(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009920(struct UnkStruct_02008DEC_sub *param0) { if (param0->unk08 != NULL) { @@ -774,7 +774,7 @@ THUMB_FUNC void FUN_02009920(struct UnkStruct1_sub *param0) param0->unk08 = NULL; } -THUMB_FUNC u32 *FUN_02009934(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 *FUN_02009934(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(param0->unk08); @@ -782,8 +782,8 @@ THUMB_FUNC u32 *FUN_02009934(struct UnkStruct1_sub *param0) return param0->unk08; } -THUMB_FUNC void FUN_0200994C(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +THUMB_FUNC void FUN_0200994C(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, void *param2, s32 param3, u32 param4, @@ -796,8 +796,8 @@ THUMB_FUNC void FUN_0200994C(struct UnkStruct1 *param0, FUN_020097FC(param1, param6, param4, param5, param7); } -THUMB_FUNC void FUN_02009978(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +THUMB_FUNC void FUN_02009978(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, @@ -815,8 +815,8 @@ THUMB_FUNC void FUN_02009978(struct UnkStruct1 *param0, FUN_020097FC(param1, param8, param6, param7, param9); } -THUMB_FUNC void FUN_020099B0(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +THUMB_FUNC void FUN_020099B0(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NARC *param2, u32 param3, u32 param4, @@ -834,7 +834,7 @@ THUMB_FUNC void FUN_020099B0(struct UnkStruct1 *param0, FUN_020097FC(param1, param8, param6, param7, param9); } -THUMB_FUNC s32 FUN_020099E8(struct UnkStruct4 *param0) +THUMB_FUNC s32 FUN_020099E8(struct UnkStruct_02008DEC_4 *param0) { s32 r3 = 0; while (param0[r3].unk00 != -2) @@ -873,7 +873,7 @@ THUMB_FUNC void *FUN_02009A04(NARC *param0, u32 param1, u32 param2, u32 param3, return r4; } -THUMB_FUNC u32 FUN_02009A50(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009A50(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -887,7 +887,7 @@ THUMB_FUNC u32 FUN_02009A50(struct UnkStruct1_sub *param0) return FUN_0201D1F8(st0); } -THUMB_FUNC void FUN_02009A90(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009A90(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); @@ -897,7 +897,7 @@ THUMB_FUNC void FUN_02009A90(struct UnkStruct5 *param0) } } -THUMB_FUNC u32 FUN_02009AC4(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009AC4(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -911,7 +911,7 @@ THUMB_FUNC u32 FUN_02009AC4(struct UnkStruct1_sub *param0) return FUN_0201D250(st0); } -THUMB_FUNC u32 FUN_02009B04(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009B04(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -925,7 +925,7 @@ THUMB_FUNC u32 FUN_02009B04(struct UnkStruct1_sub *param0) return FUN_0201D1F8(st0); } -THUMB_FUNC void FUN_02009B44(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009B44(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); @@ -935,7 +935,7 @@ THUMB_FUNC void FUN_02009B44(struct UnkStruct5 *param0) } } -THUMB_FUNC u32 FUN_02009B78(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009B78(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -949,7 +949,7 @@ THUMB_FUNC u32 FUN_02009B78(struct UnkStruct1_sub *param0) return FUN_0201D250(st0); } -THUMB_FUNC void FUN_02009BB8(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1) +THUMB_FUNC void FUN_02009BB8(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(param1); @@ -957,14 +957,14 @@ THUMB_FUNC void FUN_02009BB8(struct UnkStruct1_sub *param0, struct UnkStruct1_su FUN_0201D2DC(FUN_02009530(param0), FUN_02009544(param1)); } -THUMB_FUNC void FUN_02009BE8(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009BE8(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); FUN_0201D2DC(FUN_02009530(param0), FUN_02009544(param0)); } -THUMB_FUNC void FUN_02009C0C(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009C0C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -972,7 +972,7 @@ THUMB_FUNC void FUN_02009C0C(struct UnkStruct1_sub *param0) FUN_0201D324(FUN_02009530(param0)); } -THUMB_FUNC void FUN_02009C30(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009C30(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -984,7 +984,7 @@ THUMB_FUNC void FUN_02009C30(struct UnkStruct5 *param0) } } -THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -992,7 +992,7 @@ THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct1_sub *param0) return FUN_0201D3B0(FUN_02009530(param0)); } -THUMB_FUNC u32 FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1) +THUMB_FUNC u32 FUN_02009C80(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 0); @@ -1013,7 +1013,7 @@ THUMB_FUNC void FUN_02009CDC(u32 param0) FUN_0201D4F0(param0); } -THUMB_FUNC u32 FUN_02009CF0(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009CF0(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1027,7 +1027,7 @@ THUMB_FUNC u32 FUN_02009CF0(struct UnkStruct1_sub *param0) return FUN_0201E0E4(st0); } -THUMB_FUNC void FUN_02009D34(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009D34(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1039,7 +1039,7 @@ THUMB_FUNC void FUN_02009D34(struct UnkStruct5 *param0) } } -THUMB_FUNC u32 FUN_02009D68(struct UnkStruct1_sub *param0) +THUMB_FUNC u32 FUN_02009D68(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1053,7 +1053,7 @@ THUMB_FUNC u32 FUN_02009D68(struct UnkStruct1_sub *param0) return FUN_0201E128(st0); } -THUMB_FUNC void FUN_02009DAC(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009DAC(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1065,14 +1065,14 @@ THUMB_FUNC void FUN_02009DAC(struct UnkStruct5 *param0) } } -THUMB_FUNC void FUN_02009DE0(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009DE0(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); FUN_0201E168(FUN_02009530(param0), FUN_0200955C(param0)); } -THUMB_FUNC void FUN_02009E04(struct UnkStruct1_sub *param0) +THUMB_FUNC void FUN_02009E04(struct UnkStruct_02008DEC_sub *param0) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1080,7 +1080,7 @@ THUMB_FUNC void FUN_02009E04(struct UnkStruct1_sub *param0) FUN_0201E1C8(FUN_02009530(param0)); } -THUMB_FUNC void FUN_02009E28(struct UnkStruct5 *param0) +THUMB_FUNC void FUN_02009E28(struct UnkStruct_02008DEC_5 *param0) { GF_ASSERT(param0); for (int i = 0; i < param0->unk04; i++) @@ -1092,7 +1092,7 @@ THUMB_FUNC void FUN_02009E28(struct UnkStruct5 *param0) } } -THUMB_FUNC u32 FUN_02009E54(struct UnkStruct1_sub *param0, u32 param1) +THUMB_FUNC u32 FUN_02009E54(struct UnkStruct_02008DEC_sub *param0, u32 param1) { GF_ASSERT(param0); GF_ASSERT(FUN_020095D4(param0) == 1); @@ -1106,7 +1106,7 @@ THUMB_FUNC u32 FUN_02009E54(struct UnkStruct1_sub *param0, u32 param1) return FUN_0201E230(r0); } -THUMB_FUNC s32 FUN_02009E88(struct UnkStruct1_sub *param0, u32 param1) +THUMB_FUNC s32 FUN_02009E88(struct UnkStruct_02008DEC_sub *param0, u32 param1) { s32 ret = NNS_G2dGetImagePaletteLocation(FUN_02009E54(param0, 0), param1); if (ret != -1) diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c index e84b759b..95a854d7 100644 --- a/arm9/src/unk_0200BB14.c +++ b/arm9/src/unk_0200BB14.c @@ -264,7 +264,7 @@ THUMB_FUNC BOOL FUN_0200BD20( for (s32 i = 0; i < st14; i++) { - struct UnkStruct2 *st18 = FUN_02009660(param1->unk08, i); + struct UnkStruct_02008DEC_2 *st18 = FUN_02009660(param1->unk08, i); void *st1c = AllocAndReadFile(param0->unk000, st10[i]); FUN_02009668(st1c, st18, param0->unk000); @@ -279,7 +279,7 @@ THUMB_FUNC BOOL FUN_0200BD20( for (s32 i = 0; i < st14; i++) { - struct UnkStruct2 *st20 = FUN_02009660(param1->unk08, i); + struct UnkStruct_02008DEC_2 *st20 = FUN_02009660(param1->unk08, i); param1->unk24[i] = FUN_02009424(FUN_020096CC(st20), param0->unk000); param1->unk3c[i] = FUN_020093A8(param1->unk0c[i], st20, param1->unk24[i], param0->unk000); } @@ -451,7 +451,7 @@ THUMB_FUNC BOOL FUN_0200C00C(u32 *param0, return FALSE; } - struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + struct UnkStruct_02008DEC_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); if (r5 != NULL) { FUN_02009B04(r5); @@ -477,7 +477,7 @@ THUMB_FUNC s32 FUN_0200C06C(u32 *param0, return -1; } - struct UnkStruct1_sub * r5 = + struct UnkStruct_02008DEC_sub * r5 = FUN_02008FEC(param1->unk0c[1], param2, param3, param4, param7, param6, param5, param0[0]); if (r5 != NULL) { @@ -664,12 +664,12 @@ THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154( return ptr; } -THUMB_FUNC u32 FUN_0200C334(struct UnkStruct1 **param0, s32 param1) +THUMB_FUNC u32 FUN_0200C334(struct UnkStruct_02008DEC_1 **param0, s32 param1) { return FUN_02009E54(FUN_020094F0(param0[4], param1), 0); } -THUMB_FUNC s32 FUN_0200C344(struct UnkStruct1 **param0, s32 param1, u32 param2) +THUMB_FUNC s32 FUN_0200C344(struct UnkStruct_02008DEC_1 **param0, s32 param1, u32 param2) { return FUN_02009E88(FUN_020094F0(param0[4], param1), param2); } @@ -735,7 +735,7 @@ THUMB_FUNC BOOL FUN_0200C404(u32 *param0, return FALSE; } - struct UnkStruct1_sub *r5 = FUN_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, param0[0]); + struct UnkStruct_02008DEC_sub *r5 = FUN_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, param0[0]); if (r5 != NULL) { BOOL r4 = FUN_0200C474(param1->unk24[param5], r5); @@ -746,7 +746,7 @@ THUMB_FUNC BOOL FUN_0200C404(u32 *param0, return r5 != NULL ? TRUE : FALSE; } -THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct5 *param0, struct UnkStruct1_sub *param1) +THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct_02008DEC_5 *param0, struct UnkStruct_02008DEC_sub *param1) { for (s32 i = 0; i < param0->unk04; i++) { @@ -761,7 +761,7 @@ THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct5 *param0, struct UnkStruct1_sub *p return FALSE; } -THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2) +THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -783,7 +783,7 @@ THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct1 *param0, struct UnkStruct5 *param return FALSE; } -THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2) +THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -806,7 +806,7 @@ THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct1 *param0, struct UnkStruct5 *param return FALSE; } -THUMB_FUNC BOOL FUN_0200C548(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2) +THUMB_FUNC BOOL FUN_0200C548(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2) { for (s32 i = 0; i < param1->unk04; i++) { @@ -1182,7 +1182,7 @@ THUMB_FUNC BOOL FUN_0200C918(u32 *param0, return FALSE; } - struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + struct UnkStruct_02008DEC_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); if (r5 != NULL) { FUN_02009AC4(r5); @@ -1208,7 +1208,7 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0, return FALSE; } - struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); + struct UnkStruct_02008DEC_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]); if (r5 != NULL) { FUN_02009B78(r5); @@ -1222,18 +1222,18 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0, } THUMB_FUNC void FUN_0200C9D8( - u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) + u32 *param0, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { - struct UnkStruct1_sub *r6 = FUN_020094F0(param1[3], param5); + struct UnkStruct_02008DEC_sub *r6 = FUN_020094F0(param1[3], param5); FUN_020090FC(param1[3], r6, param2, param3, param4, param0[0]); FUN_02009BE8(r6); } THUMB_FUNC void FUN_0200CA0C( - u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) + u32 *param0, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5) { - struct UnkStruct1_sub *r6 = FUN_020094F0(param1[4], param5); + struct UnkStruct_02008DEC_sub *r6 = FUN_020094F0(param1[4], param5); FUN_02009168(param1[4], r6, param2, param3, param4, param0[0]); FUN_02009DE0(r6); diff --git a/include/unk_02008AA4.h b/include/unk_02008AA4.h index 2884547d..00343884 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, - struct UnkStruct1 *param9, - struct UnkStruct1 *param10, - struct UnkStruct1 *param11, - struct UnkStruct1 *param12, - struct UnkStruct1 *param13, - struct UnkStruct1 *param14); + struct UnkStruct_02008DEC_1 *param9, + struct UnkStruct_02008DEC_1 *param10, + struct UnkStruct_02008DEC_1 *param11, + struct UnkStruct_02008DEC_1 *param12, + struct UnkStruct_02008DEC_1 *param13, + struct UnkStruct_02008DEC_1 *param14); struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0, u32 param1, - struct UnkStruct1 *param2, - struct UnkStruct1 *param3, - struct UnkStruct1 *param4, - struct UnkStruct1 *param5, - struct UnkStruct1 *param6, - struct UnkStruct1 *param7); + struct UnkStruct_02008DEC_1 *param2, + struct UnkStruct_02008DEC_1 *param3, + struct UnkStruct_02008DEC_1 *param4, + struct UnkStruct_02008DEC_1 *param5, + struct UnkStruct_02008DEC_1 *param6, + struct UnkStruct_02008DEC_1 *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 99dc9579..31bae117 100644 --- a/include/unk_02008DEC.h +++ b/include/unk_02008DEC.h @@ -5,24 +5,24 @@ #include "NNS_g2d.h" #include "filesystem.h" -struct UnkStruct1_sub +struct UnkStruct_02008DEC_sub { u32 unk00; u32 unk04; void *unk08; }; -struct UnkStruct1 +struct UnkStruct_02008DEC_1 { u32 unk00; - struct UnkStruct1_sub *unk04; + struct UnkStruct_02008DEC_sub *unk04; s32 unk08; u32 unk0C; s32 unk10; }; -struct UnkStruct2 +struct UnkStruct_02008DEC_2 { void *unk00; s32 unk04; @@ -30,7 +30,7 @@ struct UnkStruct2 u8 unk0C; }; -struct UnkStruct3 +struct UnkStruct_02008DEC_3 { s32 unk00; u8 unk04[0x40]; @@ -38,7 +38,7 @@ struct UnkStruct3 u32 unk48; }; -struct UnkStruct4 +struct UnkStruct_02008DEC_4 { NarcId unk00; s32 unk04; @@ -48,9 +48,9 @@ struct UnkStruct4 u32 unk14; }; -struct UnkStruct5 +struct UnkStruct_02008DEC_5 { - struct UnkStruct1_sub **unk00; + struct UnkStruct_02008DEC_sub **unk00; s32 unk04; s32 unk08; }; @@ -78,18 +78,18 @@ 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_02008F34(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_1 *FUN_02008DEC(u32 param0, s32 param1, u32 param2); +void FUN_02008E2C(struct UnkStruct_02008DEC_1 *param0); +struct UnkStruct_02008DEC_sub *FUN_02008E6C( + struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, s32 param2, u32 param3); +struct UnkStruct_02008DEC_sub *FUN_02008F34(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, s32 param4, u32 param5, u32 param6); -struct UnkStruct1_sub *FUN_02008F90(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02008F90(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -97,7 +97,7 @@ struct UnkStruct1_sub *FUN_02008F90(struct UnkStruct1 *param0, u32 param5, u32 param6, BOOL param7); -struct UnkStruct1_sub *FUN_02008FEC(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02008FEC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -105,7 +105,7 @@ struct UnkStruct1_sub *FUN_02008FEC(struct UnkStruct1 *param0, u32 param5, u32 param6, u32 param7); -struct UnkStruct1_sub *FUN_0200904C(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_0200904C(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, @@ -114,33 +114,33 @@ struct UnkStruct1_sub *FUN_0200904C(struct UnkStruct1 *param0, u32 param6, u32 param7, BOOL param8); -struct UnkStruct1_sub *FUN_020090AC(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020090AC(struct UnkStruct_02008DEC_1 *param0, NarcId param1, s32 param2, BOOL param3, s32 param4, u32 param5, u32 param6); -void FUN_020090FC(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +void FUN_020090FC(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, u32 param5); -void FUN_02009168(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +void FUN_02009168(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, u32 param5); -struct UnkStruct1_sub *FUN_020091E0(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020091E0(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6); -struct UnkStruct1_sub *FUN_0200923C(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_0200923C(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -148,7 +148,7 @@ struct UnkStruct1_sub *FUN_0200923C(struct UnkStruct1 *param0, u32 param5, u32 param6, u32 param7); -struct UnkStruct1_sub *FUN_02009298(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02009298(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -156,7 +156,7 @@ struct UnkStruct1_sub *FUN_02009298(struct UnkStruct1 *param0, u32 param5, u32 param6, u32 param7); -struct UnkStruct1_sub *FUN_020092F8(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_020092F8(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, @@ -165,68 +165,68 @@ struct UnkStruct1_sub *FUN_020092F8(struct UnkStruct1 *param0, u32 param6, u32 param7, u32 param8); -struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0, +struct UnkStruct_02008DEC_sub *FUN_02009358(struct UnkStruct_02008DEC_1 *param0, NARC *param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6); -s32 FUN_020093A8(struct UnkStruct1 *param0, struct UnkStruct2 *param1, struct UnkStruct5 *param2, u32 param3); -void FUN_020093DC(struct UnkStruct1 *param0, - struct UnkStruct2 *param1, +s32 FUN_020093A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_2 *param1, struct UnkStruct_02008DEC_5 *param2, u32 param3); +void FUN_020093DC(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_2 *param1, s32 param2, s32 param3, - struct UnkStruct5 *param4, + struct UnkStruct_02008DEC_5 *param4, u32 param5); -struct UnkStruct5 *FUN_02009424(s32 param0, u32 param1); -void FUN_02009448(struct UnkStruct5 *param0); -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, s32 param1); -s32 FUN_02009530(struct UnkStruct1_sub *param0); -u32 FUN_02009544(struct UnkStruct1_sub *param0); -u32 FUN_0200955C(struct UnkStruct1_sub *param0); -u32 FUN_02009574(struct UnkStruct1_sub *param0); -u32 FUN_0200958C(struct UnkStruct1_sub *param0); -u32 FUN_020095A4(struct UnkStruct1_sub *param0); -u32 FUN_020095BC(struct UnkStruct1_sub *param0); -u32 FUN_020095D4(struct UnkStruct1_sub *param0); -u32 FUN_020095E4(struct UnkStruct1_sub *param0); -u32 FUN_02009610(struct UnkStruct1_sub *param0); -void FUN_02009630(struct UnkStruct1_sub *param0, u32 param1); +struct UnkStruct_02008DEC_5 *FUN_02009424(s32 param0, u32 param1); +void FUN_02009448(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_0200945C(struct UnkStruct_02008DEC_1 *param0, s32 param1); +void FUN_02009474(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009490(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_sub *param1); +void FUN_020094C4(struct UnkStruct_02008DEC_1 *param0); +struct UnkStruct_02008DEC_sub *FUN_020094F0(struct UnkStruct_02008DEC_1 *param0, s32 param1); +s32 FUN_02009530(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_02009544(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_0200955C(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_02009574(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_0200958C(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_020095A4(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_020095BC(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_020095D4(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_020095E4(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_02009610(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009630(struct UnkStruct_02008DEC_sub *param0, u32 param1); u32 FUN_0200965C(void); -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); -s32 FUN_020096DC(struct UnkStruct2 *param0, s32 param1); -s32 FUN_02009710(struct UnkStruct2 *param0, s32 param1); -BOOL FUN_0200973C(struct UnkStruct2 *param0, s32 param1); -u32 FUN_02009768(struct UnkStruct2 *param0, s32 param1); -u32 FUN_0200979C(struct UnkStruct2 *param0, s32 param1); -struct UnkStruct1_sub *FUN_020097D0(struct UnkStruct1 *param0); -void FUN_020097FC(struct UnkStruct1_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4); +struct UnkStruct_02008DEC_2 *FUN_02009660(struct UnkStruct_02008DEC_2 *param0, s32 param1); +void FUN_02009668(u32 *param0, struct UnkStruct_02008DEC_2 *param1, u32 param2); +void FUN_020096B4(struct UnkStruct_02008DEC_2 *param0); +s32 FUN_020096CC(struct UnkStruct_02008DEC_2 *param0); +s32 FUN_020096DC(struct UnkStruct_02008DEC_2 *param0, s32 param1); +s32 FUN_02009710(struct UnkStruct_02008DEC_2 *param0, s32 param1); +BOOL FUN_0200973C(struct UnkStruct_02008DEC_2 *param0, s32 param1); +u32 FUN_02009768(struct UnkStruct_02008DEC_2 *param0, s32 param1); +u32 FUN_0200979C(struct UnkStruct_02008DEC_2 *param0, s32 param1); +struct UnkStruct_02008DEC_sub *FUN_020097D0(struct UnkStruct_02008DEC_1 *param0); +void FUN_020097FC(struct UnkStruct_02008DEC_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4); struct CharacterData_02008DEC *FUN_0200986C(void *param0, u32 param1, u32 param2); struct PaletteData_02008DEC *FUN_0200988C(void *param0, u32 param1, u32 param2, u32 param3); struct CellDataBank_02008DEC *FUN_020098B0(void *param0, u32 param1); struct AnimBank_02008DEC *FUN_020098CC(void *param0, u32 param1); void *FUN_020098E8(void *param0, u32 param1); void *FUN_02009904(void *param0, u32 param1); -void FUN_02009920(struct UnkStruct1_sub *param0); -u32 *FUN_02009934(struct UnkStruct1_sub *param0); -void FUN_0200994C(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +void FUN_02009920(struct UnkStruct_02008DEC_sub *param0); +u32 *FUN_02009934(struct UnkStruct_02008DEC_sub *param0); +void FUN_0200994C(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, void *param2, s32 param3, u32 param4, u32 param5, u32 param6, u32 param7); -void FUN_02009978(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +void FUN_02009978(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NarcId param2, s32 param3, BOOL param4, @@ -236,8 +236,8 @@ void FUN_02009978(struct UnkStruct1 *param0, u32 param8, u32 param9, BOOL param10); -void FUN_020099B0(struct UnkStruct1 *param0, - struct UnkStruct1_sub *param1, +void FUN_020099B0(struct UnkStruct_02008DEC_1 *param0, + struct UnkStruct_02008DEC_sub *param1, NARC *param2, u32 param3, u32 param4, @@ -247,29 +247,29 @@ void FUN_020099B0(struct UnkStruct1 *param0, u32 param8, u32 param9, u32 param10); -s32 FUN_020099E8(struct UnkStruct4 *param0); +s32 FUN_020099E8(struct UnkStruct_02008DEC_4 *param0); void *FUN_02009A04(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4); -u32 FUN_02009A50(struct UnkStruct1_sub *param0); -void FUN_02009A90(struct UnkStruct5 *param0); -u32 FUN_02009AC4(struct UnkStruct1_sub *param0); -u32 FUN_02009B04(struct UnkStruct1_sub *param0); -void FUN_02009B44(struct UnkStruct5 *param0); -u32 FUN_02009B78(struct UnkStruct1_sub *param0); -void FUN_02009BB8(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1); -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); -u32 FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1); +u32 FUN_02009A50(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009A90(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_02009AC4(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_02009B04(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009B44(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_02009B78(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009BB8(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1); +void FUN_02009BE8(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009C0C(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009C30(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_02009C5C(struct UnkStruct_02008DEC_sub *param0); +u32 FUN_02009C80(struct UnkStruct_02008DEC_sub *param0, struct UnkStruct_02008DEC_sub *param1); void FUN_02009CDC(u32 param0); -u32 FUN_02009CF0(struct UnkStruct1_sub *param0); -void FUN_02009D34(struct UnkStruct5 *param0); -u32 FUN_02009D68(struct UnkStruct1_sub *param0); -void FUN_02009DAC(struct UnkStruct5 *param0); -void FUN_02009DE0(struct UnkStruct1_sub *param0); -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); +u32 FUN_02009CF0(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009D34(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_02009D68(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009DAC(struct UnkStruct_02008DEC_5 *param0); +void FUN_02009DE0(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009E04(struct UnkStruct_02008DEC_sub *param0); +void FUN_02009E28(struct UnkStruct_02008DEC_5 *param0); +u32 FUN_02009E54(struct UnkStruct_02008DEC_sub *param0, u32 param1); +s32 FUN_02009E88(struct UnkStruct_02008DEC_sub *param0, u32 param1); #endif // POKEDIAMOND_UNK_02008DEC_H diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h index 20d4739d..7d5a0083 100644 --- a/include/unk_0200BB14.h +++ b/include/unk_0200BB14.h @@ -17,9 +17,9 @@ struct UnkStruct_0200BB14_2 { u32 unk00; struct UnkStruct_02008AA4_1 *unk04; - struct UnkStruct2 *unk08; - struct UnkStruct1 *unk0c[6]; - struct UnkStruct5 *unk24[6]; + struct UnkStruct_02008DEC_2 *unk08; + struct UnkStruct_02008DEC_1 *unk0c[6]; + struct UnkStruct_02008DEC_5 *unk24[6]; s32 unk3c[6]; s32 unk54; }; @@ -158,8 +158,8 @@ BOOL FUN_0200C13C(u32 *param0, s32 param5); struct UnkStruct_0200BB14_5 *FUN_0200C154( struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2); -u32 FUN_0200C334(struct UnkStruct1 **param0, s32 param1); -s32 FUN_0200C344(struct UnkStruct1 **param0, s32 param1, u32 param2); +u32 FUN_0200C334(struct UnkStruct_02008DEC_1 **param0, s32 param1); +s32 FUN_0200C344(struct UnkStruct_02008DEC_1 **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); @@ -173,10 +173,10 @@ BOOL FUN_0200C404(u32 *param0, BOOL param4, u32 param5, s32 param6); -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); +BOOL FUN_0200C474(struct UnkStruct_02008DEC_5 *param0, struct UnkStruct_02008DEC_sub *param1); +BOOL FUN_0200C4A8(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2); +BOOL FUN_0200C4F4(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2); +BOOL FUN_0200C548(struct UnkStruct_02008DEC_1 *param0, struct UnkStruct_02008DEC_5 *param1, u32 param2); void FUN_0200C59C(u32 param0); void FUN_0200C5A8(u32 *param0); void FUN_0200C5B4(u32 *param0, u32 param1); @@ -247,9 +247,9 @@ BOOL FUN_0200C978(u32 *param0, u32 param5, s32 param6); void FUN_0200C9D8( - u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); + u32 *param0, struct UnkStruct_02008DEC_1 **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 *param0, struct UnkStruct_02008DEC_1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5); u32 FUN_0200CA40(u32 *param0); #endif // POKEDIAMOND_UNK_0200BB14_H |