summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/src/error_message_reset.c8
-rw-r--r--arm9/src/text_02054590.c8
-rw-r--r--arm9/src/unk_02016B94.c128
-rw-r--r--include/script.h2
-rw-r--r--include/text_02054590.h4
-rw-r--r--include/unk_02016B94.h116
6 files changed, 133 insertions, 133 deletions
diff --git a/arm9/src/error_message_reset.c b/arm9/src/error_message_reset.c
index 52873cdf..8780e77e 100644
--- a/arm9/src/error_message_reset.c
+++ b/arm9/src/error_message_reset.c
@@ -6,20 +6,20 @@
-const struct UnkStruct4 UNK_020FF49C = { 0, 3, 3, 0x1a, 0x12, 1, 0x23 };
+const struct UnkStruct_02016B94_4 UNK_020FF49C = { 0, 3, 3, 0x1a, 0x12, 1, 0x23 };
const u32 UNK_020FF4A4[2] = { 0x00020000, 0x00000000 };
const struct GraphicsModes UNK_020FF4AC = { mode1 : 1 };
-const struct UnkStruct1 UNK_020FF4BC = { 0, 0, 0x800, 0, 1, 0, 0, 6, 0, 1, 0, 0, 0 };
+const struct UnkStruct_02016B94_1 UNK_020FF4BC = { 0, 0, 0x800, 0, 1, 0, 0, 6, 0, 1, 0, 0, 0 };
const struct GraphicsBanks UNK_020FF4D8 = { bg : 3 };
u32 sErrorMessagePrinterLock;
extern void FUN_0200E3A0(PMLCDTarget, int);
-extern void FUN_0200CB00(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
+extern void FUN_0200CB00(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2);
extern void FUN_0200CCA4(struct Window *param0, u32 param1, u32 param2, u32 param3);
extern void FUN_0200E394(u32 param0);
@@ -35,7 +35,7 @@ THUMB_FUNC void VBlankHandler()
THUMB_FUNC void PrintErrorMessageAndReset()
{
- struct UnkStruct2 *ptr;
+ struct UnkStruct_02016B94_2 *ptr;
struct Window buf;
if (sErrorMessagePrinterLock != 1)
diff --git a/arm9/src/text_02054590.c b/arm9/src/text_02054590.c
index c9995715..6707ac6e 100644
--- a/arm9/src/text_02054590.c
+++ b/arm9/src/text_02054590.c
@@ -7,14 +7,14 @@ extern void FUN_02002ED0(u32 param0, u32 param1, u32 param2);
extern void FUN_02002EEC(u32 param0, u32 param1, u32 param2);
extern void FUN_0200CD68(
- struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u8 param4, u32 param5);
extern void FUN_0200D0BC(struct Window *param0, u32 param1, u32 param2, u32 param3);
extern void FUN_02002B60(u8 param0);
extern void FUN_02002B7C(u32 param0);
extern void FUN_02002BB8(u32 param0);
-extern void FUN_0200D300(struct UnkStruct2 *param0,
+extern void FUN_0200D300(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u32 param2,
u32 param3,
@@ -33,7 +33,7 @@ THUMB_FUNC void FUN_02054590(u32 param0, u32 param1)
FUN_02002EEC(param0, 384, 4);
}
-THUMB_FUNC void FUN_020545B8(struct UnkStruct2 *param0, struct Window *param1, u32 param2)
+THUMB_FUNC void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2)
{
if (param2 == 3)
{
@@ -80,7 +80,7 @@ THUMB_FUNC u8 FUN_020546C8(u32 param0) // bool8?
}
THUMB_FUNC void FUN_020546E0(
- struct UnkStruct2 *param0, struct Window *param1, u32 param2, u32 param3)
+ struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3)
{
u32 r4 = 0;
u32 r5 = 0;
diff --git a/arm9/src/unk_02016B94.c b/arm9/src/unk_02016B94.c
index 7eb00747..ff86037d 100644
--- a/arm9/src/unk_02016B94.c
+++ b/arm9/src/unk_02016B94.c
@@ -55,10 +55,10 @@ void (*const UNK_020EDB74[])(struct Window *) = {
FUN_020193B4,
};
-THUMB_FUNC struct UnkStruct2 *FUN_02016B94(u32 heap_id)
+THUMB_FUNC struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id)
{
- struct UnkStruct2 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct2));
- memset(ptr, 0, sizeof(struct UnkStruct2));
+ struct UnkStruct_02016B94_2 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02016B94_2));
+ memset(ptr, 0, sizeof(struct UnkStruct_02016B94_2));
ptr->unk00 = heap_id;
ptr->unk04 = 0;
ptr->unk06 = 0;
@@ -98,7 +98,7 @@ THUMB_FUNC void FUN_02016BF4(u32 *param0, u32 param1)
#ifdef NONMATCHING
THUMB_FUNC void FUN_02016C18(
- struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3)
+ struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3)
{
u8 res = FUN_020177DC(param2->unk10, param3);
switch (param1)
@@ -342,7 +342,7 @@ THUMB_FUNC void FUN_02016C18(
}
#else
THUMB_FUNC asm void FUN_02016C18(
- struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3)
+ struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3)
{
// clang-format off
push {r3-r7, lr}
@@ -990,7 +990,7 @@ _020170D2:
#endif
#ifdef NONMATCHING
-THUMB_FUNC void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3)
+THUMB_FUNC void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3)
{
if (param2 == 0)
{
@@ -1294,7 +1294,7 @@ THUMB_FUNC void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u
}
}
#else
-THUMB_FUNC asm void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3)
+THUMB_FUNC asm void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3)
{
// clang-format off
push {r3-r7, lr}
@@ -2328,7 +2328,7 @@ THUMB_FUNC void FUN_02017850(u32 param0, u8 *param1, u8 *param2)
}
}
-THUMB_FUNC void FUN_020178A0(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
if (param0->unk08[param1].unk08 != NULL)
{
@@ -2399,7 +2399,7 @@ THUMB_FUNC void FUN_0201797C(u32 param0, GX_LayerToggle toggle)
}
}
-THUMB_FUNC void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 val)
+THUMB_FUNC void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val)
{
FUN_02017B8C(&param0->unk08[param1], param2, val);
@@ -2475,17 +2475,17 @@ THUMB_FUNC void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2,
}
}
-THUMB_FUNC fx32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
return param0->unk08[param1].unk14;
}
-THUMB_FUNC fx32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
return param0->unk08[param1].unk18;
}
-THUMB_FUNC void FUN_02017B60(struct UnkStruct2 *param0,
+THUMB_FUNC void FUN_02017B60(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u32 param2,
fx32 param3,
@@ -2497,7 +2497,7 @@ THUMB_FUNC void FUN_02017B60(struct UnkStruct2 *param0,
FUN_02017BD0(param0, param1, param4, param5, param6);
}
-THUMB_FUNC void FUN_02017B8C(struct InnerStruct *param0, u32 param1, fx32 val)
+THUMB_FUNC void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val)
{
switch (param1)
{
@@ -2523,7 +2523,7 @@ THUMB_FUNC void FUN_02017B8C(struct InnerStruct *param0, u32 param1, fx32 val)
}
THUMB_FUNC void FUN_02017BD0(
- struct UnkStruct2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4)
{
switch (param1)
{
@@ -2562,7 +2562,7 @@ THUMB_FUNC void FUN_02017BD0(
}
}
-THUMB_FUNC void FUN_02017C6C(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
struct Mtx22 mtx;
MTX22_2DAffine(&mtx, 0, 0x1000, 0x1000, 0);
@@ -2586,7 +2586,7 @@ THUMB_FUNC void FUN_02017C98(const void *param0, void *param1, u32 param2)
MIi_CpuCopy16(param0, param1, param2);
}
-THUMB_FUNC void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
FUN_02017CE8(param0,
param1,
@@ -2596,7 +2596,7 @@ THUMB_FUNC void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1)
}
THUMB_FUNC void FUN_02017CE8(
- struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
{
u32 st0 = param3;
if (param3 == 0)
@@ -2653,13 +2653,13 @@ THUMB_FUNC void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size)
}
}
-THUMB_FUNC void FUN_02017DFC(struct UnkStruct2 *param0, u32 param1, void *param2, u32 param3)
+THUMB_FUNC void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3)
{
FUN_02017C98(param2, param0->unk08[param1].unk08, param3);
}
THUMB_FUNC void FUN_02017E14(
- struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
{
if (param0->unk08[param1].unk1e == 0)
{
@@ -2670,7 +2670,7 @@ THUMB_FUNC void FUN_02017E14(
}
THUMB_FUNC void FUN_02017E40(
- struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4)
{
u32 st0 = param3;
if (param3 == 0)
@@ -2730,7 +2730,7 @@ THUMB_FUNC void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id)
}
THUMB_FUNC void FUN_02017F48(
- struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
void *st4;
u32 st0 = param3 * param0->unk08[param1].unk1f;
@@ -2854,12 +2854,12 @@ THUMB_FUNC u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3)
}
THUMB_FUNC void FUN_02018148(
- struct UnkStruct2 *param0, u32 param1, void *param2, u8 param3, u8 param4, u8 param5, u8 param6)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u8 param3, u8 param4, u8 param5, u8 param6)
{
FUN_02018170(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6);
}
-THUMB_FUNC void FUN_02018170(struct UnkStruct2 *param0,
+THUMB_FUNC void FUN_02018170(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u8 param2,
u8 param3,
@@ -2901,7 +2901,7 @@ THUMB_FUNC void FUN_02018170(struct UnkStruct2 *param0,
}
}
-THUMB_FUNC void FUN_020181EC(struct UnkStruct2 *param0,
+THUMB_FUNC void FUN_020181EC(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u8 param2,
u8 param3,
@@ -2943,7 +2943,7 @@ THUMB_FUNC void FUN_020181EC(struct UnkStruct2 *param0,
}
}
-THUMB_FUNC void FUN_02018268(struct InnerStruct *param0,
+THUMB_FUNC void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0,
u8 param1,
u8 param2,
u8 param3,
@@ -3036,7 +3036,7 @@ THUMB_FUNC void FUN_02018268(struct InnerStruct *param0,
}
}
-THUMB_FUNC void FUN_020183DC(struct InnerStruct *param0,
+THUMB_FUNC void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0,
u8 param1,
u8 param2,
u8 param3,
@@ -3129,7 +3129,7 @@ THUMB_FUNC void FUN_020183DC(struct InnerStruct *param0,
}
}
-THUMB_FUNC void FUN_02018540(struct UnkStruct2 *param0,
+THUMB_FUNC void FUN_02018540(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u16 param2,
u8 param3,
@@ -3150,7 +3150,7 @@ THUMB_FUNC void FUN_02018540(struct UnkStruct2 *param0,
}
THUMB_FUNC void FUN_02018590(
- struct InnerStruct *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
+ struct UnkStruct_02016B94_2_sub *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
{
void *r4 = param0->unk08;
@@ -3197,7 +3197,7 @@ THUMB_FUNC void FUN_02018590(
}
THUMB_FUNC void FUN_02018640(
- struct InnerStruct *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5)
+ struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5)
{
void *r4 = param0->unk08;
@@ -3231,7 +3231,7 @@ THUMB_FUNC void FUN_02018640(
}
THUMB_FUNC void FUN_020186B4(
- struct UnkStruct2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
{
void *r4 = param0->unk08[param1].unk08;
@@ -3264,7 +3264,7 @@ THUMB_FUNC void FUN_020186B4(
}
}
-THUMB_FUNC void FUN_02018744(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
if (param0->unk08[param1].unk08 != NULL)
{
@@ -3273,7 +3273,7 @@ THUMB_FUNC void FUN_02018744(struct UnkStruct2 *param0, u32 param1)
}
}
-THUMB_FUNC void FUN_02018768(struct UnkStruct2 *param0, u32 param1, u16 param2)
+THUMB_FUNC void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2)
{
if (param0->unk08[param1].unk08 != NULL)
{
@@ -3282,7 +3282,7 @@ THUMB_FUNC void FUN_02018768(struct UnkStruct2 *param0, u32 param1, u16 param2)
}
}
-THUMB_FUNC void FUN_0201878C(struct UnkStruct2 *param0, u32 param1, u16 param2)
+THUMB_FUNC void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2)
{
if (param0->unk08[param1].unk08 != NULL)
{
@@ -3344,18 +3344,18 @@ THUMB_FUNC u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2]
return ptr;
}
-THUMB_FUNC void *FUN_0201886C(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
return param0->unk08[param1].unk08;
}
-THUMB_FUNC u16 FUN_02018878(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
return param0->unk08[param1].unk20;
}
#ifdef NONMATCHING
-THUMB_FUNC u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
// the compiler keeps optimizing the stack away :(
@@ -3442,7 +3442,7 @@ THUMB_FUNC u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1)
return 0;
}
#else
-THUMB_FUNC asm u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC asm u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
// clang-format off
sub sp, #0x20
@@ -3704,8 +3704,8 @@ _02018A38:
#endif
#ifdef NONMATCHING
-THUMB_FUNC void FUN_02018A60(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+THUMB_FUNC void FUN_02018A60(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -3801,8 +3801,8 @@ THUMB_FUNC void FUN_02018A60(struct UnkStruct3 *param0,
}
}
#else
-THUMB_FUNC asm void FUN_02018A60(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+THUMB_FUNC asm void FUN_02018A60(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -4115,8 +4115,8 @@ _02018C92:
#endif
#ifdef NONMATCHING
-THUMB_FUNC void FUN_02018CA0(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+THUMB_FUNC void FUN_02018CA0(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -4128,8 +4128,8 @@ THUMB_FUNC void FUN_02018CA0(struct UnkStruct3 *param0,
// horrible for loops like the one above
}
#else
-THUMB_FUNC asm void FUN_02018CA0(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+THUMB_FUNC asm void FUN_02018CA0(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -4399,7 +4399,7 @@ _02018E7C:
#endif
THUMB_FUNC void FUN_02018E88(
- struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
+ struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
{
int r6 = param1 + param3;
@@ -4440,7 +4440,7 @@ THUMB_FUNC void FUN_02018E88(
}
THUMB_FUNC void FUN_02018F4C(
- struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
+ struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
{
int r6 = param1 + param3;
@@ -4515,7 +4515,7 @@ enum UnkEnum1
UnkEnum1_1 = 1
};
-THUMB_FUNC void FUN_02019064(struct UnkStruct2 *param0,
+THUMB_FUNC void FUN_02019064(struct UnkStruct_02016B94_2 *param0,
struct Window *param1,
u8 param2,
u8 param3,
@@ -4561,7 +4561,7 @@ THUMB_FUNC void FUN_02019064(struct UnkStruct2 *param0,
}
THUMB_FUNC void FUN_020190EC(
- struct UnkStruct2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5)
+ struct UnkStruct_02016B94_2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5)
{
u32 size = (u32)(param2 * param3 * 32);
@@ -4582,7 +4582,7 @@ THUMB_FUNC void FUN_020190EC(
}
THUMB_FUNC void FUN_02019150(
- struct UnkStruct2 *param0, struct Window *param1, struct UnkStruct4 *param2)
+ struct UnkStruct_02016B94_2 *param0, struct Window *param1, struct UnkStruct_02016B94_4 *param2)
{
FUN_02019064(param0,
@@ -4915,8 +4915,8 @@ THUMB_FUNC void FUN_02019684(struct Window *window,
u16 param9,
u16 param10)
{
- struct UnkStruct3 st1c = { param1, param4, param5 };
- struct UnkStruct3 st14 = {
+ struct UnkStruct_02016B94_3 st1c = { param1, param4, param5 };
+ struct UnkStruct_02016B94_3 st14 = {
window->unk0c, (u16)(window->unk07 << 3), (u16)(window->unk08 << 3)
};
@@ -4933,7 +4933,7 @@ THUMB_FUNC void FUN_02019684(struct Window *window,
THUMB_FUNC void FUN_020196F4(
struct Window *window, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5)
{
- struct UnkStruct3 st8 = { window->unk0c, (u16)(window->unk07 << 3), (u16)(window->unk08 << 3) };
+ struct UnkStruct_02016B94_3 st8 = { window->unk0c, (u16)(window->unk07 << 3), (u16)(window->unk08 << 3) };
if (window->unk00->unk08[window->unk04].unk1e == 0)
{
@@ -7738,7 +7738,7 @@ THUMB_FUNC u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path
return st0;
}
-THUMB_FUNC void FUN_0201AB60(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0)
{
FUN_0201AC78(param0);
FUN_0201AB78(param0);
@@ -7747,7 +7747,7 @@ THUMB_FUNC void FUN_0201AB60(struct UnkStruct2 *param0)
param0->unk06 = 0;
}
-THUMB_FUNC void FUN_0201AB78(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0)
{
if ((param0->unk06 & 1) != 0)
{
@@ -7790,12 +7790,12 @@ THUMB_FUNC void FUN_0201AB78(struct UnkStruct2 *param0)
}
}
-THUMB_FUNC void FUN_0201AC68(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1)
{
param0->unk06 |= 1 << param1;
}
-THUMB_FUNC void FUN_0201AC78(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0)
{
if ((param0->unk04 & 1) != 0)
{
@@ -7906,19 +7906,19 @@ THUMB_FUNC void FUN_0201AC78(struct UnkStruct2 *param0)
}
}
-THUMB_FUNC void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3)
+THUMB_FUNC void FUN_0201AEE4(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3)
{
FUN_02017B8C(&param0->unk08[param1], param2, param3);
param0->unk04 |= 1 << param1;
}
-THUMB_FUNC void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u16 param3)
+THUMB_FUNC void FUN_0201AF08(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3)
{
FUN_0201AF2C(&param0->unk08[param1], param2, param3);
param0->unk04 |= 1 << param1;
}
-THUMB_FUNC void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u16 val)
+THUMB_FUNC void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val)
{
switch (param1)
{
@@ -7934,13 +7934,13 @@ THUMB_FUNC void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u16 val)
}
}
-THUMB_FUNC void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3)
+THUMB_FUNC void FUN_0201AF50(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3)
{
FUN_0201AF74(&param0->unk08[param1], param2, param3);
param0->unk04 |= 1 << param1;
}
-THUMB_FUNC void FUN_0201AF74(struct InnerStruct *param0, u32 param1, fx32 val)
+THUMB_FUNC void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val)
{
switch (param1 - 9)
{
@@ -7965,7 +7965,7 @@ THUMB_FUNC void FUN_0201AF74(struct InnerStruct *param0, u32 param1, fx32 val)
}
}
-THUMB_FUNC u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4)
+THUMB_FUNC u32 FUN_0201AFBC(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4)
{
void *st18;
u16 r6;
@@ -8041,7 +8041,7 @@ THUMB_FUNC u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8
return 0;
}
-THUMB_FUNC void FUN_0201B118(struct UnkStruct2 *param0, u8 param1, u8 *param2)
+THUMB_FUNC void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2)
{
u8 i, j;
if (param1 != 0)
diff --git a/include/script.h b/include/script.h
index 92d586b6..01bba305 100644
--- a/include/script.h
+++ b/include/script.h
@@ -28,7 +28,7 @@ struct UnkStruct_02046444
struct UnkSavStruct80
{
u8 padding[0x8];
- struct UnkStruct2 *unk08;
+ struct UnkStruct_02016B94_2 *unk08;
struct SaveBlock2 *saveBlock2; //0xC
struct UnkStruct_0204639C *unk10;
u8 padding2[0x8];
diff --git a/include/text_02054590.h b/include/text_02054590.h
index 6c5090e7..57560595 100644
--- a/include/text_02054590.h
+++ b/include/text_02054590.h
@@ -6,13 +6,13 @@
#include "unk_02016B94.h"
void FUN_02054590(u32 param0, u32 param1);
-void FUN_020545B8(struct UnkStruct2 *param0, struct Window *param1, u32 param2);
+void FUN_020545B8(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2);
void FUN_02054608(struct Window *param0, struct Options *options);
void FUN_0205464C(struct Window *param0);
u16 FUN_02054658(u8 windowId, const u16 *str, struct Options *options, u8 param3);
u16 DrawFieldMessage(u8 windowId, const u16 *str, u8 fontId, u32 speed, u8 a4, u32 a5);
u8 FUN_020546C8(u32 param0);
-void FUN_020546E0(struct UnkStruct2 *param0, struct Window *param1, u32 param2, u32 param3);
+void FUN_020546E0(struct UnkStruct_02016B94_2 *param0, struct Window *param1, u32 param2, u32 param3);
void FUN_02054744(struct Window *param0, u32 param1, u32 param2);
#endif // POKEDIAMOND_UNK_02054590_H
diff --git a/include/unk_02016B94.h b/include/unk_02016B94.h
index f4e57737..b19fd625 100644
--- a/include/unk_02016B94.h
+++ b/include/unk_02016B94.h
@@ -13,7 +13,7 @@
#define reg_G2_BG3P (u32 *)0x4000030
#define reg_G2S_DB_BG2P (u32 *)0x4001020
#define reg_G2S_DB_BG3P (u32 *)0x4001030
-struct UnkStruct1
+struct UnkStruct_02016B94_1
{
u32 unk00;
u32 unk04;
@@ -31,13 +31,13 @@ struct UnkStruct1
u32 unk18;
};
-struct UnkStruct2
+struct UnkStruct_02016B94_2
{
u32 unk00;
u16 unk04;
u16 unk06;
- struct InnerStruct
+ struct UnkStruct_02016B94_2_sub
{
void *unk08;
u32 unk0c;
@@ -59,14 +59,14 @@ struct UnkStruct2
} unk08[8];
};
-struct UnkStruct3
+struct UnkStruct_02016B94_3
{
void *unk00;
u16 unk04;
u16 unk06;
};
-struct UnkStruct4
+struct UnkStruct_02016B94_4
{
u8 unk0;
u8 unk1;
@@ -79,7 +79,7 @@ struct UnkStruct4
struct Window
{
- struct UnkStruct2 *unk00;
+ struct UnkStruct_02016B94_2 *unk00;
u8 unk04;
u8 unk05;
u8 unk06;
@@ -91,53 +91,53 @@ struct Window
void *unk0c;
};
-struct UnkStruct2 *FUN_02016B94(u32 heap_id);
+struct UnkStruct_02016B94_2 *FUN_02016B94(u32 heap_id);
u32 FUN_02016BB8(u32 *param0);
void FUN_02016BBC(const struct GraphicsModes *modes);
void FUN_02016BF4(u32 *param0, u32 param1);
-void FUN_02016C18(struct UnkStruct2 *param0, u8 param1, struct UnkStruct1 *param2, u8 param3);
-void FUN_020170F4(struct UnkStruct2 *param0, u8 param1, u32 param2, u8 param3);
+void FUN_02016C18(struct UnkStruct_02016B94_2 *param0, u8 param1, struct UnkStruct_02016B94_1 *param2, u8 param3);
+void FUN_020170F4(struct UnkStruct_02016B94_2 *param0, u8 param1, u32 param2, u8 param3);
u8 FUN_020177DC(u8 param0, u32 param1);
void FUN_02017850(u32 param0, u8 *param1, u8 *param2);
-void FUN_020178A0(struct UnkStruct2 *param0, u32 param1);
+void FUN_020178A0(struct UnkStruct_02016B94_2 *param0, u32 param1);
void FUN_020178BC(u32 param0, u16 param1);
void FUN_0201797C(u32 param0, GX_LayerToggle toggle);
-void FUN_020179E0(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 val);
-fx32 FUN_02017B48(struct UnkStruct2 *param0, u32 param1);
-fx32 FUN_02017B54(struct UnkStruct2 *param0, u32 param1);
-void FUN_02017B60(struct UnkStruct2 *param0,
+void FUN_020179E0(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 val);
+fx32 FUN_02017B48(struct UnkStruct_02016B94_2 *param0, u32 param1);
+fx32 FUN_02017B54(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02017B60(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u32 param2,
fx32 param3,
struct Mtx22 *param4,
fx32 param5,
fx32 param6);
-void FUN_02017B8C(struct InnerStruct *param0, u32 param1, fx32 val);
+void FUN_02017B8C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val);
void FUN_02017BD0(
- struct UnkStruct2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
-void FUN_02017C6C(struct UnkStruct2 *param0, u32 param1);
+ struct UnkStruct_02016B94_2 *param0, u32 param1, struct Mtx22 *param2, fx32 param3, fx32 param4);
+void FUN_02017C6C(struct UnkStruct_02016B94_2 *param0, u32 param1);
void FUN_02017C98(const void *param0, void *param1, u32 param2);
-void FUN_02017CD0(struct UnkStruct2 *param0, u32 param1);
-void FUN_02017CE8(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017CD0(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02017CE8(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
void FUN_02017D68(u32 param0, void *param1, u32 offset, u32 size);
-void FUN_02017DFC(struct UnkStruct2 *param0, u32 param1, void *param2, u32 param3);
-void FUN_02017E14(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
-void FUN_02017E40(struct UnkStruct2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017DFC(struct UnkStruct_02016B94_2 *param0, u32 param1, void *param2, u32 param3);
+void FUN_02017E14(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
+void FUN_02017E40(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 *param2, u32 param3, u32 param4);
void FUN_02017E84(u32 param0, void *param1, u32 offset, u32 size);
void FUN_02017F18(u32 param0, u32 size, u32 offset, u32 heap_id);
-void FUN_02017F48(struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02017F48(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
void FUN_02017FB4(u32 param0, void *param1, u32 offset, u32 size);
void FUN_02017FE4(u32 param0, u32 param1);
u16 FUN_02017FFC(u8 param0, u8 param1, u8 param2);
u16 FUN_02018068(u8 param0, u8 param1, u8 param2, u8 param3);
-void FUN_02018148(struct UnkStruct2 *param0,
+void FUN_02018148(struct UnkStruct_02016B94_2 *param0,
u32 param1,
void *param2,
u8 param3,
u8 param4,
u8 param5,
u8 param6);
-void FUN_02018170(struct UnkStruct2 *param0,
+void FUN_02018170(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u8 param2,
u8 param3,
@@ -148,7 +148,7 @@ void FUN_02018170(struct UnkStruct2 *param0,
u8 param8,
u8 param9,
u8 param10);
-void FUN_020181EC(struct UnkStruct2 *param0,
+void FUN_020181EC(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u8 param2,
u8 param3,
@@ -159,7 +159,7 @@ void FUN_020181EC(struct UnkStruct2 *param0,
u8 param8,
u8 param9,
u8 param10);
-void FUN_02018268(struct InnerStruct *param0,
+void FUN_02018268(struct UnkStruct_02016B94_2_sub *param0,
u8 param1,
u8 param2,
u8 param3,
@@ -170,7 +170,7 @@ void FUN_02018268(struct InnerStruct *param0,
u8 param8,
u8 param9,
u8 param10);
-void FUN_020183DC(struct InnerStruct *param0,
+void FUN_020183DC(struct UnkStruct_02016B94_2_sub *param0,
u8 param1,
u8 param2,
u8 param3,
@@ -181,7 +181,7 @@ void FUN_020183DC(struct InnerStruct *param0,
u8 param8,
u8 param9,
u8 param10);
-void FUN_02018540(struct UnkStruct2 *param0,
+void FUN_02018540(struct UnkStruct_02016B94_2 *param0,
u32 param1,
u16 param2,
u8 param3,
@@ -190,22 +190,22 @@ void FUN_02018540(struct UnkStruct2 *param0,
u8 param6,
u8 param7);
void FUN_02018590(
- struct InnerStruct *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+ struct UnkStruct_02016B94_2_sub *param0, u16 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
void FUN_02018640(
- struct InnerStruct *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
+ struct UnkStruct_02016B94_2_sub *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5);
void FUN_020186B4(
- struct UnkStruct2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
-void FUN_02018744(struct UnkStruct2 *param0, u32 param1);
-void FUN_02018768(struct UnkStruct2 *param0, u32 param1, u16 param2);
-void FUN_0201878C(struct UnkStruct2 *param0, u32 param1, u16 param2);
+ struct UnkStruct_02016B94_2 *param0, u32 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void FUN_02018744(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02018768(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
+void FUN_0201878C(struct UnkStruct_02016B94_2 *param0, u32 param1, u16 param2);
void *FUN_020187B0(u32 param0);
void FUN_02018808(u8 *param0, u32 param1, u8 (*param2)[2], u8 param3);
u8 (*FUN_02018848(u8 *param0, u32 param1, u8 param2, u32 heap_id))[2];
-void *FUN_0201886C(struct UnkStruct2 *param0, u32 param1);
-u16 FUN_02018878(struct UnkStruct2 *param0, u32 param1);
-u8 FUN_02018884(struct UnkStruct2 *param0, u32 param1);
-void FUN_02018A60(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+void *FUN_0201886C(struct UnkStruct_02016B94_2 *param0, u32 param1);
+u16 FUN_02018878(struct UnkStruct_02016B94_2 *param0, u32 param1);
+u8 FUN_02018884(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_02018A60(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -213,8 +213,8 @@ void FUN_02018A60(struct UnkStruct3 *param0,
u16 param6,
u16 param7,
u16 param8);
-void FUN_02018CA0(struct UnkStruct3 *param0,
- struct UnkStruct3 *param1,
+void FUN_02018CA0(struct UnkStruct_02016B94_3 *param0,
+ struct UnkStruct_02016B94_3 *param1,
u16 param2,
u16 param3,
u16 param4,
@@ -223,13 +223,13 @@ void FUN_02018CA0(struct UnkStruct3 *param0,
u16 param7,
u16 param8);
void FUN_02018E88(
- struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+ struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
void FUN_02018F4C(
- struct UnkStruct3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+ struct UnkStruct_02016B94_3 *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
void *FUN_02018FF4(u32 heap_id, s32 size);
void FUN_0201901C(struct Window *param0);
BOOL FUN_02019048(struct Window *param0);
-void FUN_02019064(struct UnkStruct2 *param0,
+void FUN_02019064(struct UnkStruct_02016B94_2 *param0,
struct Window *param1,
u8 param2,
u8 param3,
@@ -239,8 +239,8 @@ void FUN_02019064(struct UnkStruct2 *param0,
u8 param7,
u16 param8);
void FUN_020190EC(
- struct UnkStruct2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
-void FUN_02019150(struct UnkStruct2 *param0, struct Window *param1, struct UnkStruct4 *param2);
+ struct UnkStruct_02016B94_2 *param0, struct Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
+void FUN_02019150(struct UnkStruct_02016B94_2 *param0, struct Window *param1, struct UnkStruct_02016B94_4 *param2);
void FUN_02019178(struct Window *param0);
void FUN_020191A4(struct Window *param0, int param1);
void CopyWindowToVram(struct Window *param0);
@@ -301,16 +301,16 @@ void FUN_0201AB20(struct Window *window, u8 param1);
void FUN_0201AB24(struct Window *window, u8 param1);
u32 FUN_0201AB28(struct Window *window, u32 heap_id, const char *path);
u32 FUN_0201AB44(struct Window *window, u32 heap_id, const char *path);
-void FUN_0201AB60(struct UnkStruct2 *param0);
-void FUN_0201AB78(struct UnkStruct2 *param0);
-void FUN_0201AC68(struct UnkStruct2 *param0, u32 param1);
-void FUN_0201AC78(struct UnkStruct2 *param0);
-void FUN_0201AEE4(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
-void FUN_0201AF08(struct UnkStruct2 *param0, u32 param1, u32 param2, u16 param3);
-void FUN_0201AF2C(struct InnerStruct *param0, u32 param1, u16 val);
-void FUN_0201AF50(struct UnkStruct2 *param0, u32 param1, u32 param2, fx32 param3);
-void FUN_0201AF74(struct InnerStruct *param0, u32 param1, fx32 val);
-u32 FUN_0201AFBC(struct UnkStruct2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
-void FUN_0201B118(struct UnkStruct2 *param0, u8 param1, u8 *param2);
+void FUN_0201AB60(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AB78(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AC68(struct UnkStruct_02016B94_2 *param0, u32 param1);
+void FUN_0201AC78(struct UnkStruct_02016B94_2 *param0);
+void FUN_0201AEE4(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF08(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, u16 param3);
+void FUN_0201AF2C(struct UnkStruct_02016B94_2_sub *param0, u32 param1, u16 val);
+void FUN_0201AF50(struct UnkStruct_02016B94_2 *param0, u32 param1, u32 param2, fx32 param3);
+void FUN_0201AF74(struct UnkStruct_02016B94_2_sub *param0, u32 param1, fx32 val);
+u32 FUN_0201AFBC(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 param2, u8 param3, u16 *param4);
+void FUN_0201B118(struct UnkStruct_02016B94_2 *param0, u8 param1, u8 *param2);
#endif // POKEDIAMOND_UNK_02016B94_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-20 11:10:34 +0000