summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/src/unk_02008AA4.c46
-rw-r--r--arm9/src/unk_02008DEC.c43
-rw-r--r--arm9/src/unk_0200BB14.c196
-rw-r--r--include/unk_02008AA4.h24
-rw-r--r--include/unk_02008DEC.h42
-rw-r--r--include/unk_0200BB14.h77
6 files changed, 198 insertions, 230 deletions
diff --git a/arm9/src/unk_02008AA4.c b/arm9/src/unk_02008AA4.c
index 2d7fb77d..4ddb6995 100644
--- a/arm9/src/unk_02008AA4.c
+++ b/arm9/src/unk_02008AA4.c
@@ -3,16 +3,8 @@
#include "GX_vramcnt.h"
#include "heap.h"
#include "unk_0200BB14.h"
+#include "unk_02008DEC.h"
-extern u32 FUN_020094F0(u32 param0, s32 param1);
-extern u32 FUN_02009C80(u32, u32);
-extern u32 FUN_02009544(u32);
-extern u32 FUN_02009E54(u32 param0, u32 param1);
-extern u32 FUN_02009C5C(u32);
-extern u32 FUN_02009574(u32);
-extern u32 FUN_0200958C(u32);
-extern u32 FUN_020095A4(u32);
-extern u32 FUN_020095BC(u32);
extern void FUN_0202134C(void *, u32);
extern void FUN_02009FD8(void *param0, u32 *param1, u32 param2, u32 param3);
extern u32 FUN_0201FCB0(u32 *);
@@ -29,20 +21,20 @@ THUMB_FUNC void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0,
s32 param6,
u32 param7,
u32 param8,
- u32 param9,
- u32 param10,
- u32 param11,
- u32 param12,
- u32 param13,
- u32 param14)
+ struct UnkStruct1 *param9,
+ struct UnkStruct1 *param10,
+ struct UnkStruct1 *param11,
+ struct UnkStruct1 *param12,
+ struct UnkStruct1 *param13,
+ struct UnkStruct1 *param14)
{
- u32 r7;
- u32 st14;
- u32 st10;
+ struct UnkStruct1_sub *r7;
+ struct UnkStruct1_sub *st14;
+ struct UnkStruct1_sub *st10;
- u32 stc = 0;
- u32 r4 = 0;
- u32 st8 = 0;
+ struct UnkStruct1_sub *stc = NULL;
+ struct UnkStruct1_sub *r4 = NULL;
+ struct UnkStruct1_sub *st8 = NULL;
GF_ASSERT(param9);
GF_ASSERT(param10);
@@ -124,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,
- u32 param2,
- u32 param3,
- u32 param4,
- u32 param5,
- u32 param6,
- u32 param7)
+ struct UnkStruct1 *param2,
+ struct UnkStruct1 *param3,
+ struct UnkStruct1 *param4,
+ struct UnkStruct1 *param5,
+ struct UnkStruct1 *param6,
+ struct UnkStruct1 *param7)
{
s32 r4 = 0;
diff --git a/arm9/src/unk_02008DEC.c b/arm9/src/unk_02008DEC.c
index ad4f9700..76e32b63 100644
--- a/arm9/src/unk_02008DEC.c
+++ b/arm9/src/unk_02008DEC.c
@@ -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, u32 *param2, u32 param3)
+ struct UnkStruct1 *param0, struct UnkStruct2 *param1, struct UnkStruct5 *param2, u32 param3)
{
GF_ASSERT(param0);
GF_ASSERT(param1);
@@ -363,17 +363,17 @@ THUMB_FUNC void FUN_020093DC(struct UnkStruct1 *param0,
struct UnkStruct2 *param1,
s32 param2,
s32 param3,
- s32 *param4,
+ struct UnkStruct5 *param4,
u32 param5)
{
for (int r5 = param2; r5 < param2 + param3; r5++)
{
struct UnkStruct1_sub *r0 = FUN_02008E6C(param0, param1, r5, param5);
- if (param4 != NULL && param4[1] > param4[2])
+ if (param4 != NULL && param4->unk04 > param4->unk08)
{
- ((u32 *)param4[0])[param4[2]] = (u32)r0;
- param4[2]++;
+ param4->unk00[param4->unk08] = r0;
+ param4->unk08++;
}
}
}
@@ -430,7 +430,7 @@ THUMB_FUNC void FUN_020094C4(struct UnkStruct1 *param0)
}
}
-THUMB_FUNC struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, u32 param1)
+THUMB_FUNC struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, s32 param1)
{
GF_ASSERT(param0);
@@ -545,9 +545,9 @@ THUMB_FUNC u32 FUN_0200965C(void)
return 16;
}
-THUMB_FUNC u32 *FUN_02009660(u32 *param0, s32 param1)
+THUMB_FUNC struct UnkStruct2 *FUN_02009660(struct UnkStruct2 *param0, s32 param1)
{
- return &param0[param1 * 4];
+ return &param0[param1];
}
THUMB_FUNC void FUN_02009668(u32 *param0, struct UnkStruct2 *param1, u32 param2)
@@ -677,29 +677,6 @@ THUMB_FUNC struct UnkStruct1_sub *FUN_020097D0(struct UnkStruct1 *param0)
return NULL;
}
-struct CharacterData_02008DEC
-{
- NNSG2dCharacterData *chData;
- u32 unk04;
-};
-
-struct PaletteData_02008DEC
-{
- NNSG2dPaletteData *plttData;
- u32 unk04;
- u32 unk08;
-};
-
-struct CellDataBank_02008DEC
-{
- NNSG2dCellDataBank *cellBank;
-};
-
-struct AnimBank_02008DEC
-{
- NNSG2dAnimBankData *bankData;
-};
-
THUMB_FUNC void FUN_020097FC(
struct UnkStruct1_sub *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
@@ -1015,7 +992,7 @@ THUMB_FUNC u32 FUN_02009C5C(struct UnkStruct1_sub *param0)
return FUN_0201D3B0(FUN_02009530(param0));
}
-THUMB_FUNC void FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1)
+THUMB_FUNC u32 FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1)
{
GF_ASSERT(param0);
GF_ASSERT(FUN_020095D4(param0) == 0);
@@ -1025,7 +1002,7 @@ THUMB_FUNC void FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_su
s32 r4 = FUN_02009530(param0);
if (FUN_0201D3D4(r4, ((u32 **)FUN_02009574(param1))[3][0]) == 0)
{
- FUN_0201D458(FUN_0201D3B0(r4));
+ return FUN_0201D458(FUN_0201D3B0(r4));
}
}
diff --git a/arm9/src/unk_0200BB14.c b/arm9/src/unk_0200BB14.c
index ac8d048e..e84b759b 100644
--- a/arm9/src/unk_0200BB14.c
+++ b/arm9/src/unk_0200BB14.c
@@ -3,6 +3,7 @@
#include "game_init.h"
#include "heap.h"
#include "unk_02008AA4.h"
+#include "unk_02008DEC.h"
extern void FUN_0201D060(u32 *param0, u32 param1, u32 param2);
extern void FUN_0201E00C(u32 param0, u32 param1);
@@ -24,44 +25,15 @@ extern void FUN_0201FDEC(u32 param0);
extern void FUN_02009F80();
extern void FUN_0201C348();
extern void FUN_0201FD58(u32 param0);
-extern u32 FUN_02009660(u32 *param0, s32 param1);
-extern void FUN_020096B4(u32 param0);
-extern void FUN_02009C30(u32 *param0);
-extern void FUN_02009E28(u32 *param0);
-extern void FUN_02009448(u32 *param0);
-extern void FUN_02008E2C(u32 param0);
extern void FUN_0201C350(u32 param0);
extern void FUN_0201D12C();
extern void FUN_0201E08C();
extern void FUN_02009FA0();
-extern u32 FUN_0200965C(s32 param0);
-extern void FUN_02009668(void *param0, u32 param1, u32 param2);
-extern u32 FUN_020096CC(u32 param0);
-extern u32 FUN_02008DEC(u32 param0, s32 param1, u32 param2);
-extern u32 *FUN_02009424(u32 param0, u32 param1);
-extern u32 FUN_020093A8(u32 param0, u32 param1, u32 *param2, u32 param3);
-extern void FUN_02009A90(u32 *param0);
-extern void FUN_02009D34(u32 *param0);
extern u32 FUN_0201FE94(struct UnkStruct_0200BB14_4 *param0);
extern void FUN_02020130(u32 param0, u32 param1);
extern void FUN_02020248(u32 param0, u32 param1);
-extern u32 FUN_0200945C(u32 param0, s32 param1);
-extern u32 FUN_02008F34(
- u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6);
-extern void FUN_02009B04(u32 param0);
-extern u32 FUN_02008FEC(
- u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6, u32 param7);
-extern u32 FUN_02009D68(u32 param0);
-extern u32 FUN_02009E88(u32 param0, u32 param1);
extern void FUN_02003108(u32 param0, u32 param1, u16 param2, u32 param3);
extern u8 FUN_020202A0(u32 param0);
-extern u32 FUN_020094F0(u32 param0, u32 param1);
-extern u32 FUN_02009E54(u32 param0, u32 param1);
-extern void FUN_02009CDC(u32 param0);
-extern u32 FUN_020090AC(
- u32 param0, u32 param1, u32 param2, u32 param3, s32 param4, u32 param5, u32 param6);
-extern u32 FUN_02009530(u32 param0);
-extern void FUN_02009490(u32 param0, u32 param1);
extern void FUN_0201D324(u32 param0);
extern void FUN_0201E1C8(u32 param0);
extern void FUN_020201E4(u32 param0, u32 param1);
@@ -91,12 +63,6 @@ extern void FUN_02020100(u32 param0, u32 param1);
extern void FUN_02020054(u32 param0, u32 *param1);
extern void FUN_02020358(u32 param0, u32 param1);
extern void FUN_02020398(u32 param0, u32 param1);
-extern void FUN_02009AC4(u32 param0);
-extern void FUN_02009B78(u32 param0);
-extern void FUN_020090FC(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5);
-extern void FUN_02009BE8(u32 param0);
-extern void FUN_02009168(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5);
-extern void FUN_02009DE0(u32 param0);
THUMB_FUNC struct UnkStruct_0200BB14_1 *FUN_0200BB14(u32 heap_id)
{
@@ -293,12 +259,12 @@ THUMB_FUNC BOOL FUN_0200BD20(
}
param1->unk54 = st14;
- u32 r2 = FUN_0200965C(st14);
+ u32 r2 = FUN_0200965C();
param1->unk08 = AllocFromHeap(param0->unk000, r2 * st14);
for (s32 i = 0; i < st14; i++)
{
- u32 st18 = FUN_02009660(param1->unk08, i);
+ struct UnkStruct2 *st18 = FUN_02009660(param1->unk08, i);
void *st1c = AllocAndReadFile(param0->unk000, st10[i]);
FUN_02009668(st1c, st18, param0->unk000);
@@ -313,7 +279,7 @@ THUMB_FUNC BOOL FUN_0200BD20(
for (s32 i = 0; i < st14; i++)
{
- u32 st20 = FUN_02009660(param1->unk08, i);
+ struct UnkStruct2 *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);
}
@@ -432,7 +398,7 @@ THUMB_FUNC u32 FUN_0200BE74(u32 *param0,
}
THUMB_FUNC BOOL FUN_0200BF60(
- struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2)
+ struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, s32 *param2)
{
struct UnkStruct_0200BB14_1 *st0 = param0;
s32 i;
@@ -462,9 +428,9 @@ THUMB_FUNC BOOL FUN_0200BF60(
param1->unk24[i] = FUN_02009424(param2[i], st0->unk000);
param1->unk3c[i] = 0;
- for (s32 j = 0; j < (s32)param1->unk24[i][1]; j++)
+ for (s32 j = 0; j < param1->unk24[i]->unk04; j++)
{
- ((u32 *)param1->unk24[i][0])[j] = 0;
+ param1->unk24[i]->unk00[j] = NULL;
}
}
}
@@ -474,9 +440,9 @@ THUMB_FUNC BOOL FUN_0200BF60(
THUMB_FUNC BOOL FUN_0200C00C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6)
{
@@ -485,8 +451,8 @@ THUMB_FUNC BOOL FUN_0200C00C(u32 *param0,
return FALSE;
}
- u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
- if (r5 != 0)
+ struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
+ if (r5 != NULL)
{
FUN_02009B04(r5);
FUN_0200C474(param1->unk24[0], r5);
@@ -494,14 +460,14 @@ THUMB_FUNC BOOL FUN_0200C00C(u32 *param0,
}
GF_ASSERT(0);
- return r5 != 0 ? TRUE : FALSE;
+ return r5 != NULL ? TRUE : FALSE;
}
THUMB_FUNC s32 FUN_0200C06C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
u32 param6,
s32 param7)
@@ -511,16 +477,16 @@ THUMB_FUNC s32 FUN_0200C06C(u32 *param0,
return -1;
}
- u32 r5 =
+ struct UnkStruct1_sub * r5 =
FUN_02008FEC(param1->unk0c[1], param2, param3, param4, param7, param6, param5, param0[0]);
- if (r5 != 0)
+ if (r5 != NULL)
{
GF_ASSERT(FUN_02009D68(r5) == 1);
FUN_0200C474(param1->unk24[1], r5);
return (s8)FUN_02009E88(r5, param6);
}
- GF_ASSERT(0);
+ GF_ASSERT(FALSE);
return -1;
}
@@ -528,9 +494,9 @@ THUMB_FUNC u8 FUN_0200C0DC(u32 param0,
u32 param1,
u32 *param2,
struct UnkStruct_0200BB14_2 *param3,
- u32 param4,
- u32 param5,
- u32 param6,
+ NarcId param4,
+ s32 param5,
+ BOOL param6,
u32 param7,
u32 param8,
s32 param9)
@@ -546,9 +512,9 @@ THUMB_FUNC u8 FUN_0200C0DC(u32 param0,
THUMB_FUNC BOOL FUN_0200C124(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
s32 param5)
{
return FUN_0200C404(param0, param1, param2, param3, param4, 2, param5);
@@ -556,9 +522,9 @@ THUMB_FUNC BOOL FUN_0200C124(u32 *param0,
THUMB_FUNC BOOL FUN_0200C13C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
s32 param5)
{
return FUN_0200C404(param0, param1, param2, param3, param4, 3, param5);
@@ -698,12 +664,12 @@ THUMB_FUNC struct UnkStruct_0200BB14_5 *FUN_0200C154(
return ptr;
}
-THUMB_FUNC u32 FUN_0200C334(u32 *param0, u32 param1)
+THUMB_FUNC u32 FUN_0200C334(struct UnkStruct1 **param0, s32 param1)
{
return FUN_02009E54(FUN_020094F0(param0[4], param1), 0);
}
-THUMB_FUNC u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2)
+THUMB_FUNC s32 FUN_0200C344(struct UnkStruct1 **param0, s32 param1, u32 param2)
{
return FUN_02009E88(FUN_020094F0(param0[4], param1), param2);
}
@@ -752,15 +718,15 @@ THUMB_FUNC void FUN_0200C3DC(u32 *param0)
}
FUN_0201FFC8(param0[0]);
- FUN_02008C80(param0[2]);
+ FUN_02008C80((struct UnkStruct_02008AA4_1 *)param0[2]);
FreeToHeap(param0);
}
THUMB_FUNC BOOL FUN_0200C404(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6)
{
@@ -769,25 +735,25 @@ THUMB_FUNC BOOL FUN_0200C404(u32 *param0,
return FALSE;
}
- u32 r5 = FUN_020090AC(param1->unk0c[param5], param2, param3, param4, param6, param5, param0[0]);
- if (r5 != 0)
+ struct UnkStruct1_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);
GF_ASSERT(r4 == TRUE);
return r4;
}
GF_ASSERT(0);
- return r5 != 0 ? TRUE : FALSE;
+ return r5 != NULL ? TRUE : FALSE;
}
-THUMB_FUNC BOOL FUN_0200C474(u32 *param0, u32 param1)
+THUMB_FUNC BOOL FUN_0200C474(struct UnkStruct5 *param0, struct UnkStruct1_sub *param1)
{
- for (s32 i = 0; i < (s32)param0[1]; i++)
+ for (s32 i = 0; i < param0->unk04; i++)
{
- if (((u32 *)param0[0])[i] == 0)
+ if (param0->unk00[i] == NULL)
{
- ((u32 *)param0[0])[i] = param1;
- param0[2]++;
+ param0->unk00[i] = param1;
+ param0->unk08++;
return TRUE;
}
}
@@ -795,19 +761,19 @@ THUMB_FUNC BOOL FUN_0200C474(u32 *param0, u32 param1)
return FALSE;
}
-THUMB_FUNC BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2)
+THUMB_FUNC BOOL FUN_0200C4A8(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2)
{
- for (s32 i = 0; i < (s32)param1[1]; i++)
+ for (s32 i = 0; i < param1->unk04; i++)
{
- if (((u32 *)param1[0])[i] != 0)
+ if (param1->unk00[i] != 0)
{
- u32 r0 = FUN_02009530(((u32 *)param1[0])[i]);
+ s32 r0 = FUN_02009530(param1->unk00[i]);
if (r0 == param2)
{
- FUN_02009490(param0, ((u32 *)param1[0])[i]);
- ((u32 *)param1[0])[i] = 0;
- param1[2]--;
+ FUN_02009490(param0, param1->unk00[i]);
+ param1->unk00[i] = NULL;
+ param1->unk08--;
return TRUE;
}
@@ -817,20 +783,20 @@ THUMB_FUNC BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2)
return FALSE;
}
-THUMB_FUNC BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2)
+THUMB_FUNC BOOL FUN_0200C4F4(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2)
{
- for (s32 i = 0; i < (s32)param1[1]; i++)
+ for (s32 i = 0; i < param1->unk04; i++)
{
- if (((u32 *)param1[0])[i] != 0)
+ if (param1->unk00[i] != NULL)
{
- u32 r0 = FUN_02009530(((u32 *)param1[0])[i]);
+ s32 r0 = FUN_02009530(param1->unk00[i]);
if (r0 == param2)
{
FUN_0201D324(param2);
- FUN_02009490(param0, ((u32 *)param1[0])[i]);
- ((u32 *)param1[0])[i] = 0;
- param1[2]--;
+ FUN_02009490(param0, param1->unk00[i]);
+ param1->unk00[i] = NULL;
+ param1->unk08--;
return TRUE;
}
@@ -840,20 +806,20 @@ THUMB_FUNC BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2)
return FALSE;
}
-THUMB_FUNC BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2)
+THUMB_FUNC BOOL FUN_0200C548(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2)
{
- for (s32 i = 0; i < (s32)param1[1]; i++)
+ for (s32 i = 0; i < param1->unk04; i++)
{
- if (((u32 *)param1[0])[i] != 0)
+ if (param1->unk00[i] != 0)
{
- u32 r0 = FUN_02009530(((u32 *)param1[0])[i]);
+ s32 r0 = FUN_02009530(param1->unk00[i]);
if (r0 == param2)
{
FUN_0201E1C8(param2);
- FUN_02009490(param0, ((u32 *)param1[0])[i]);
- ((u32 *)param1[0])[i] = 0;
- param1[2]--;
+ FUN_02009490(param0, param1->unk00[i]);
+ param1->unk00[i] = NULL;
+ param1->unk08--;
return TRUE;
}
@@ -1205,9 +1171,9 @@ THUMB_FUNC void FUN_0200C90C(u32 *param0, u32 param1)
THUMB_FUNC BOOL FUN_0200C918(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6)
{
@@ -1216,8 +1182,8 @@ THUMB_FUNC BOOL FUN_0200C918(u32 *param0,
return FALSE;
}
- u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
- if (r5 != 0)
+ struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
+ if (r5 != NULL)
{
FUN_02009AC4(r5);
FUN_0200C474(param1->unk24[0], r5);
@@ -1225,15 +1191,15 @@ THUMB_FUNC BOOL FUN_0200C918(u32 *param0,
return TRUE;
}
- GF_ASSERT(0);
- return r5 != 0 ? TRUE : FALSE;
+ GF_ASSERT(FALSE);
+ return r5 != NULL ? TRUE : FALSE;
}
THUMB_FUNC BOOL FUN_0200C978(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6)
{
@@ -1242,8 +1208,8 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0,
return FALSE;
}
- u32 r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
- if (r5 != 0)
+ struct UnkStruct1_sub *r5 = FUN_02008F34(param1->unk0c[0], param2, param3, param4, param6, param5, param0[0]);
+ if (r5 != NULL)
{
FUN_02009B78(r5);
FUN_0200C474(param1->unk24[0], r5);
@@ -1251,23 +1217,23 @@ THUMB_FUNC BOOL FUN_0200C978(u32 *param0,
return TRUE;
}
- GF_ASSERT(0);
- return r5 != 0 ? TRUE : FALSE;
+ GF_ASSERT(FALSE);
+ return r5 != NULL ? TRUE : FALSE;
}
THUMB_FUNC void FUN_0200C9D8(
- u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5)
+ u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5)
{
- u32 r6 = FUN_020094F0(param1[3], param5);
+ struct UnkStruct1_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, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5)
+ u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5)
{
- u32 r6 = FUN_020094F0(param1[4], param5);
+ struct UnkStruct1_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 448a7101..2884547d 100644
--- a/include/unk_02008AA4.h
+++ b/include/unk_02008AA4.h
@@ -31,20 +31,20 @@ void FUN_02008AA4(struct UnkStruct_0200BB14_sub *param0,
s32 param6,
u32 param7,
u32 param8,
- u32 param9,
- u32 param10,
- u32 param11,
- u32 param12,
- u32 param13,
- u32 param14);
+ struct UnkStruct1 *param9,
+ struct UnkStruct1 *param10,
+ struct UnkStruct1 *param11,
+ struct UnkStruct1 *param12,
+ struct UnkStruct1 *param13,
+ struct UnkStruct1 *param14);
struct UnkStruct_02008AA4_1 *FUN_02008BE0(struct UnkStruct_02008AA4_2 *param0,
u32 param1,
- u32 param2,
- u32 param3,
- u32 param4,
- u32 param5,
- u32 param6,
- u32 param7);
+ struct UnkStruct1 *param2,
+ struct UnkStruct1 *param3,
+ struct UnkStruct1 *param4,
+ struct UnkStruct1 *param5,
+ struct UnkStruct1 *param6,
+ struct UnkStruct1 *param7);
void FUN_02008C80(struct UnkStruct_02008AA4_1 *param0);
u32 FUN_02008C9C(u32 param0, void *param1, u32 param2);
void FUN_02008D04(u32 param0, u32 param1, u32 param2);
diff --git a/include/unk_02008DEC.h b/include/unk_02008DEC.h
index a3cdfc1a..99dc9579 100644
--- a/include/unk_02008DEC.h
+++ b/include/unk_02008DEC.h
@@ -1,4 +1,8 @@
+#ifndef POKEDIAMOND_UNK_02008DEC_H
+#define POKEDIAMOND_UNK_02008DEC_H
+
#include "global.h"
+#include "NNS_g2d.h"
#include "filesystem.h"
struct UnkStruct1_sub
@@ -48,12 +52,36 @@ struct UnkStruct5
{
struct UnkStruct1_sub **unk00;
s32 unk04;
+ s32 unk08;
+};
+
+struct CharacterData_02008DEC
+{
+ NNSG2dCharacterData *chData;
+ u32 unk04;
+};
+
+struct PaletteData_02008DEC
+{
+ NNSG2dPaletteData *plttData;
+ u32 unk04;
u32 unk08;
};
+struct CellDataBank_02008DEC
+{
+ NNSG2dCellDataBank *cellBank;
+};
+
+struct AnimBank_02008DEC
+{
+ NNSG2dAnimBankData *bankData;
+};
+
struct UnkStruct1 *FUN_02008DEC(u32 param0, s32 param1, u32 param2);
void FUN_02008E2C(struct UnkStruct1 *param0);
-struct UnkStruct1_sub *FUN_02008E6C(struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, u32 param3);
+struct UnkStruct1_sub *FUN_02008E6C(
+ struct UnkStruct1 *param0, struct UnkStruct2 *param1, s32 param2, u32 param3);
struct UnkStruct1_sub *FUN_02008F34(struct UnkStruct1 *param0,
NarcId param1,
s32 param2,
@@ -144,12 +172,12 @@ struct UnkStruct1_sub *FUN_02009358(struct UnkStruct1 *param0,
s32 param4,
u32 param5,
u32 param6);
-s32 FUN_020093A8(struct UnkStruct1 *param0, struct UnkStruct2 *param1, u32 *param2, u32 param3);
+s32 FUN_020093A8(struct UnkStruct1 *param0, struct UnkStruct2 *param1, struct UnkStruct5 *param2, u32 param3);
void FUN_020093DC(struct UnkStruct1 *param0,
struct UnkStruct2 *param1,
s32 param2,
s32 param3,
- s32 *param4,
+ struct UnkStruct5 *param4,
u32 param5);
struct UnkStruct5 *FUN_02009424(s32 param0, u32 param1);
void FUN_02009448(struct UnkStruct5 *param0);
@@ -157,7 +185,7 @@ u32 FUN_0200945C(struct UnkStruct1 *param0, s32 param1);
void FUN_02009474(struct UnkStruct1_sub *param0);
void FUN_02009490(struct UnkStruct1 *param0, struct UnkStruct1_sub *param1);
void FUN_020094C4(struct UnkStruct1 *param0);
-struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, u32 param1);
+struct UnkStruct1_sub *FUN_020094F0(struct UnkStruct1 *param0, s32 param1);
s32 FUN_02009530(struct UnkStruct1_sub *param0);
u32 FUN_02009544(struct UnkStruct1_sub *param0);
u32 FUN_0200955C(struct UnkStruct1_sub *param0);
@@ -170,7 +198,7 @@ u32 FUN_020095E4(struct UnkStruct1_sub *param0);
u32 FUN_02009610(struct UnkStruct1_sub *param0);
void FUN_02009630(struct UnkStruct1_sub *param0, u32 param1);
u32 FUN_0200965C(void);
-u32 *FUN_02009660(u32 *param0, s32 param1);
+struct UnkStruct2 *FUN_02009660(struct UnkStruct2 *param0, s32 param1);
void FUN_02009668(u32 *param0, struct UnkStruct2 *param1, u32 param2);
void FUN_020096B4(struct UnkStruct2 *param0);
s32 FUN_020096CC(struct UnkStruct2 *param0);
@@ -232,7 +260,7 @@ void FUN_02009BE8(struct UnkStruct1_sub *param0);
void FUN_02009C0C(struct UnkStruct1_sub *param0);
void FUN_02009C30(struct UnkStruct5 *param0);
u32 FUN_02009C5C(struct UnkStruct1_sub *param0);
-void FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1);
+u32 FUN_02009C80(struct UnkStruct1_sub *param0, struct UnkStruct1_sub *param1);
void FUN_02009CDC(u32 param0);
u32 FUN_02009CF0(struct UnkStruct1_sub *param0);
void FUN_02009D34(struct UnkStruct5 *param0);
@@ -243,3 +271,5 @@ void FUN_02009E04(struct UnkStruct1_sub *param0);
void FUN_02009E28(struct UnkStruct5 *param0);
u32 FUN_02009E54(struct UnkStruct1_sub *param0, u32 param1);
s32 FUN_02009E88(struct UnkStruct1_sub *param0, u32 param1);
+
+#endif // POKEDIAMOND_UNK_02008DEC_H
diff --git a/include/unk_0200BB14.h b/include/unk_0200BB14.h
index 04c6dcb0..20d4739d 100644
--- a/include/unk_0200BB14.h
+++ b/include/unk_0200BB14.h
@@ -2,6 +2,7 @@
#define POKEDIAMOND_UNK_0200BB14_H
#include "global.h"
+#include "unk_02008DEC.h"
struct UnkStruct_0200BB14_1
{
@@ -16,10 +17,10 @@ struct UnkStruct_0200BB14_2
{
u32 unk00;
struct UnkStruct_02008AA4_1 *unk04;
- u32 *unk08;
- u32 unk0c[6];
- u32 *unk24[6];
- u32 unk3c[6];
+ struct UnkStruct2 *unk08;
+ struct UnkStruct1 *unk0c[6];
+ struct UnkStruct5 *unk24[6];
+ s32 unk3c[6];
s32 unk54;
};
@@ -117,19 +118,19 @@ u32 FUN_0200BE74(u32 *param0,
u32 param12,
u32 param13);
BOOL FUN_0200BF60(
- struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2);
+ struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, s32 *param2);
BOOL FUN_0200C00C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6);
s32 FUN_0200C06C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
u32 param6,
s32 param7);
@@ -137,28 +138,28 @@ u8 FUN_0200C0DC(u32 param0,
u32 param1,
u32 *param2,
struct UnkStruct_0200BB14_2 *param3,
- u32 param4,
- u32 param5,
- u32 param6,
+ NarcId param4,
+ s32 param5,
+ BOOL param6,
u32 param7,
u32 param8,
s32 param9);
BOOL FUN_0200C124(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
s32 param5);
BOOL FUN_0200C13C(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
s32 param5);
struct UnkStruct_0200BB14_5 *FUN_0200C154(
struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14_2 *param1, u32 *param2);
-u32 FUN_0200C334(u32 *param0, u32 param1);
-u32 FUN_0200C344(u32 *param0, u32 param1, u32 param2);
+u32 FUN_0200C334(struct UnkStruct1 **param0, s32 param1);
+s32 FUN_0200C344(struct UnkStruct1 **param0, s32 param1, u32 param2);
BOOL FUN_0200C358(struct UnkStruct_0200BB14_2 *param0, u32 param1);
BOOL FUN_0200C368(struct UnkStruct_0200BB14_2 *param0, u32 param1);
BOOL FUN_0200C378(struct UnkStruct_0200BB14_2 *param0, u32 param1);
@@ -167,15 +168,15 @@ void FUN_0200C398(struct UnkStruct_0200BB14_1 *param0, struct UnkStruct_0200BB14
void FUN_0200C3DC(u32 *param0);
BOOL FUN_0200C404(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6);
-BOOL FUN_0200C474(u32 *param0, u32 param1);
-BOOL FUN_0200C4A8(u32 param0, u32 *param1, u32 param2);
-BOOL FUN_0200C4F4(u32 param0, u32 *param1, u32 param2);
-BOOL FUN_0200C548(u32 param0, u32 *param1, u32 param2);
+BOOL FUN_0200C474(struct UnkStruct5 *param0, struct UnkStruct1_sub *param1);
+BOOL FUN_0200C4A8(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2);
+BOOL FUN_0200C4F4(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2);
+BOOL FUN_0200C548(struct UnkStruct1 *param0, struct UnkStruct5 *param1, u32 param2);
void FUN_0200C59C(u32 param0);
void FUN_0200C5A8(u32 *param0);
void FUN_0200C5B4(u32 *param0, u32 param1);
@@ -233,20 +234,22 @@ void FUN_0200C904(u32 param0, u32 param1);
void FUN_0200C90C(u32 *param0, u32 param1);
BOOL FUN_0200C918(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6);
BOOL FUN_0200C978(u32 *param0,
struct UnkStruct_0200BB14_2 *param1,
- u32 param2,
- u32 param3,
- u32 param4,
+ NarcId param2,
+ s32 param3,
+ BOOL param4,
u32 param5,
s32 param6);
-void FUN_0200C9D8(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5);
-void FUN_0200CA0C(u32 *param0, u32 *param1, u32 param2, u32 param3, u32 param4, u32 param5);
+void FUN_0200C9D8(
+ u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5);
+void FUN_0200CA0C(
+ u32 *param0, struct UnkStruct1 **param1, NarcId param2, s32 param3, BOOL param4, s32 param5);
u32 FUN_0200CA40(u32 *param0);
#endif // POKEDIAMOND_UNK_0200BB14_H
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-01 04:07:38 +0000