summaryrefslogtreecommitdiff
path: root/arm9/src
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/src')
-rw-r--r--arm9/src/render_window.c7
-rw-r--r--arm9/src/unk_02006D98.c100
2 files changed, 53 insertions, 54 deletions
diff --git a/arm9/src/render_window.c b/arm9/src/render_window.c
index 7a682eb6..1826e199 100644
--- a/arm9/src/render_window.c
+++ b/arm9/src/render_window.c
@@ -9,6 +9,7 @@
#include "unk_020061E8.h"
#include "unk_0200BB14.h"
#include "unk_0200CA44.h"
+#include "unk_02006D98.h"
const struct UnkStruct_0200CABC_3 UNK_020ECE88 = {
10,
@@ -50,8 +51,6 @@ extern void MOD05_021D971C(struct UnkStruct_0200CABC_2 *param0,
u32 param4,
u32 param5);
extern u32 *MOD05_021D9820(struct UnkStruct_0200CABC_2 *param0, void *);
-extern struct UnkStruct63_021DB450 *FUN_02006D98(u32);
-extern void FUN_020072E8(struct UnkStruct63_021DB450 *param0);
extern void FUN_02012400(u16, u16, u16, void *, void *);
extern u32 NNS_G2dGetImageLocation(u32, u32);
extern void *FUN_02012470(u16, u16, u16);
@@ -898,7 +897,7 @@ THUMB_FUNC void FUN_0200DE30(struct UnkStruct_0200CABC_2 *param0, u8 param1, u8
THUMB_FUNC void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8 param2)
{
- struct UnkStruct63_021DB450 *r7 = FUN_02006D98(param0->unk162);
+ struct UnkStruct_02006D98 *r7 = FUN_02006D98(param0->unk162);
struct SomeDrawPokemonStruct stc;
FUN_02068C00(&stc, param1, param2, 2, 0, 0, 0);
FUN_0200DEF4(param0, &stc);
@@ -907,7 +906,7 @@ THUMB_FUNC void FUN_0200DE80(struct UnkStruct_0200CABC_2 *param0, u16 param1, u8
THUMB_FUNC void FUN_0200DEC0(struct UnkStruct_0200CABC_2 *param0, struct Pokemon *param1)
{
- struct UnkStruct63_021DB450 *r6 = FUN_02006D98(param0->unk162);
+ struct UnkStruct_02006D98 *r6 = FUN_02006D98(param0->unk162);
struct SomeDrawPokemonStruct st0;
FUN_02068B68(&st0, param1, 2);
FUN_0200DEF4(param0, &st0);
diff --git a/arm9/src/unk_02006D98.c b/arm9/src/unk_02006D98.c
index 78e3d157..e4d7008d 100644
--- a/arm9/src/unk_02006D98.c
+++ b/arm9/src/unk_02006D98.c
@@ -638,12 +638,12 @@ const u8 UNK_020ECD4C[] = {
0x00,
};
-struct UnkStruct4 *UNK_02105AE8[] = {
+struct UnkStruct_02006D98_3 *UNK_02105AE8[] = {
// ugly hack to fix extra padding added by the compiler
- (struct UnkStruct4 *)(UNK_020ECCE0 + 2),
- (struct UnkStruct4 *)UNK_020ECC78,
- (struct UnkStruct4 *)UNK_020ECC10,
- (struct UnkStruct4 *)UNK_020ECDCC,
+ (struct UnkStruct_02006D98_3 *)(UNK_020ECCE0 + 2),
+ (struct UnkStruct_02006D98_3 *)UNK_020ECC78,
+ (struct UnkStruct_02006D98_3 *)UNK_020ECC10,
+ (struct UnkStruct_02006D98_3 *)UNK_020ECDCC,
};
extern void NNS_G2dSetupSoftwareSpriteCamera(void);
@@ -658,9 +658,9 @@ extern void NNS_G2dDrawSpriteFast(s16 param0,
int param7,
int param8);
-THUMB_FUNC struct UnkStruct1 *FUN_02006D98(u32 heap_id)
+THUMB_FUNC struct UnkStruct_02006D98 *FUN_02006D98(u32 heap_id)
{
- struct UnkStruct1 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct1));
+ struct UnkStruct_02006D98 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02006D98));
ptr->unk298 = heap_id;
ptr->unk2E0 = 0;
ptr->unk29C = 0;
@@ -678,7 +678,7 @@ THUMB_FUNC struct UnkStruct1 *FUN_02006D98(u32 heap_id)
for (int i = 0; i < 4; i++)
{
- MIi_CpuClearFast(0, &ptr->unk000[i], sizeof(struct UnkStruct2));
+ MIi_CpuClearFast(0, &ptr->unk000[i], sizeof(struct UnkStruct_02006D98_2));
}
NNS_G2dSetupSoftwareSpriteCamera();
@@ -716,7 +716,7 @@ THUMB_FUNC struct UnkStruct1 *FUN_02006D98(u32 heap_id)
#ifdef NONMATCHING
// mostly matching, only 2 register writes messed up
-THUMB_FUNC void FUN_02006ED4(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_02006ED4(struct UnkStruct_02006D98 *param0)
{
s32 arg3;
s32 arg4;
@@ -911,7 +911,7 @@ THUMB_FUNC void FUN_02006ED4(struct UnkStruct1 *param0)
reg_G3_MTX_POP = 1;
}
#else
-asm void FUN_02006ED4(struct UnkStruct1 *param0)
+asm void FUN_02006ED4(struct UnkStruct_02006D98 *param0)
{
// clang-format off
push {r3-r7, lr}
@@ -1421,7 +1421,7 @@ _020072D6:
}
#endif
-THUMB_FUNC void FUN_020072E8(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_020072E8(struct UnkStruct_02006D98 *param0)
{
FreeToHeap(param0->unk2AC);
FreeToHeap(param0->unk2B0);
@@ -1429,7 +1429,7 @@ THUMB_FUNC void FUN_020072E8(struct UnkStruct1 *param0)
FreeToHeap(param0);
}
-THUMB_FUNC void FUN_02007314(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_02007314(struct UnkStruct_02006D98_2 *param0)
{
param0->unk59 = 0;
for (s32 i = 0; i < 10; i++)
@@ -1447,12 +1447,12 @@ THUMB_FUNC void FUN_02007314(struct UnkStruct2 *param0)
param0->unk5A = param0->unk84[param0->unk59].unk1;
}
-THUMB_FUNC void FUN_0200737C(struct UnkStruct2 *param0, struct UnkStruct2_sub *param1)
+THUMB_FUNC void FUN_0200737C(struct UnkStruct_02006D98_2 *param0, struct UnkStruct_02006D98_sub *param1)
{
- MI_CpuCopy8(param1, param0->unk84, sizeof(struct UnkStruct2_sub) * 10);
+ MI_CpuCopy8(param1, param0->unk84, sizeof(struct UnkStruct_02006D98_sub) * 10);
}
-THUMB_FUNC BOOL FUN_02007390(struct UnkStruct2 *param0)
+THUMB_FUNC BOOL FUN_02007390(struct UnkStruct_02006D98_2 *param0)
{
if (param0->unk58 != 0)
{
@@ -1461,14 +1461,14 @@ THUMB_FUNC BOOL FUN_02007390(struct UnkStruct2 *param0)
return FALSE;
}
-THUMB_FUNC struct UnkStruct2 *FUN_020073A0(struct UnkStruct1 *param0,
+THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073A0(struct UnkStruct_02006D98 *param0,
struct UnkStruct63_021DB49C *param1,
u32 param2,
u32 param3,
u32 param4,
u32 param5,
const void *param6,
- void (*param7)(struct UnkStruct2 *, void *))
+ void (*param7)(struct UnkStruct_02006D98_2 *, void *))
{
s32 i;
for (i = 0; i < 4; i++)
@@ -1483,7 +1483,7 @@ THUMB_FUNC struct UnkStruct2 *FUN_020073A0(struct UnkStruct1 *param0,
return FUN_020073E8(param0, param1, param2, param3, param4, param5, i, param6, param7);
}
-THUMB_FUNC struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0,
+THUMB_FUNC struct UnkStruct_02006D98_2 *FUN_020073E8(struct UnkStruct_02006D98 *param0,
struct UnkStruct63_021DB49C *param1,
u32 param2,
u32 param3,
@@ -1491,11 +1491,11 @@ THUMB_FUNC struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0,
u32 param5,
s32 param6,
const void *param7,
- void (*param8)(struct UnkStruct2 *, void *))
+ void (*param8)(struct UnkStruct_02006D98_2 *, void *))
{
GF_ASSERT(param0->unk000[param6].unk00_0 == 0);
- MIi_CpuClearFast(0, &param0->unk000[param6], sizeof(struct UnkStruct2));
+ MIi_CpuClearFast(0, &param0->unk000[param6], sizeof(struct UnkStruct_02006D98_2));
param0->unk000[param6].unk00_0 = 1;
param0->unk000[param6].unk00_7 = 1;
param0->unk000[param6].unk00_8 = 1;
@@ -1530,12 +1530,12 @@ THUMB_FUNC struct UnkStruct2 *FUN_020073E8(struct UnkStruct1 *param0,
return &param0->unk000[param6];
}
-THUMB_FUNC void FUN_02007534(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_02007534(struct UnkStruct_02006D98_2 *param0)
{
param0->unk00_0 = 0;
}
-THUMB_FUNC void FUN_02007540(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_02007540(struct UnkStruct_02006D98 *param0)
{
for (s32 i = 0; i < 4; i++)
{
@@ -1543,7 +1543,7 @@ THUMB_FUNC void FUN_02007540(struct UnkStruct1 *param0)
}
}
-THUMB_FUNC void FUN_02007558(struct UnkStruct2 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_02007558(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2)
{
switch (param1)
{
@@ -1696,7 +1696,7 @@ THUMB_FUNC void FUN_02007558(struct UnkStruct2 *param0, u32 param1, u32 param2)
}
}
-THUMB_FUNC u32 FUN_0200782C(struct UnkStruct2 *param0, u32 param1)
+THUMB_FUNC u32 FUN_0200782C(struct UnkStruct_02006D98_2 *param0, u32 param1)
{
switch (param1)
{
@@ -1844,7 +1844,7 @@ THUMB_FUNC u32 FUN_0200782C(struct UnkStruct2 *param0, u32 param1)
return 0;
}
-THUMB_FUNC void FUN_020079E0(struct UnkStruct2 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_020079E0(struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2)
{
switch (param1)
{
@@ -1998,7 +1998,7 @@ THUMB_FUNC void FUN_020079E0(struct UnkStruct2 *param0, u32 param1, u32 param2)
}
THUMB_FUNC void FUN_02007E40(
- struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
+ struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
param0->unk54_1 = 1;
param0->unk44 = (u8)param1;
@@ -2008,7 +2008,7 @@ THUMB_FUNC void FUN_02007E40(
}
THUMB_FUNC void FUN_02007E68(
- struct UnkStruct2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
+ struct UnkStruct_02006D98_2 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
param0->unk54_C = 1;
param0->unk48 = (u8)param1;
@@ -2019,7 +2019,7 @@ THUMB_FUNC void FUN_02007E68(
}
THUMB_FUNC void FUN_02007E98(
- struct UnkStruct1 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
+ struct UnkStruct_02006D98 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
for (s32 i = 0; i < 4; i++)
{
@@ -2037,7 +2037,7 @@ THUMB_FUNC void FUN_02007E98(
}
}
-THUMB_FUNC void FUN_02007EEC(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_02007EEC(struct UnkStruct_02006D98_2 *param0)
{
param0->unk54_C = 0;
param0->unk48 = 0;
@@ -2048,18 +2048,18 @@ THUMB_FUNC void FUN_02007EEC(struct UnkStruct2 *param0)
param0->unk00_8 = 1;
}
-THUMB_FUNC BOOL FUN_02007F20(struct UnkStruct2 *param0)
+THUMB_FUNC BOOL FUN_02007F20(struct UnkStruct_02006D98_2 *param0)
{
return param0->unk54_C == 1;
}
-THUMB_FUNC void FUN_02007F34(struct UnkStruct2 *param0, s32 param1)
+THUMB_FUNC void FUN_02007F34(struct UnkStruct_02006D98_2 *param0, s32 param1)
{
param0->unk2E = (s16)((40 - param1) - (((40 - param1) * param0->unk36) >> 8));
}
#ifdef NONMATCHING
-THUMB_FUNC void FUN_02007F48(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_02007F48(struct UnkStruct_02006D98_2 *param0)
{
u8 *r6 = &param0->unk59;
if (param0->unk58 == 0)
@@ -2103,7 +2103,7 @@ THUMB_FUNC void FUN_02007F48(struct UnkStruct2 *param0)
}
}
#else
-asm void FUN_02007F48(struct UnkStruct2 *param0)
+asm void FUN_02007F48(struct UnkStruct_02006D98_2 *param0)
{
// clang-format off
push {r4-r7}
@@ -2218,13 +2218,13 @@ _0200800A:
}
#endif
-THUMB_FUNC void FUN_02008010(u8 *param0, struct UnkStruct2_sub *param1)
+THUMB_FUNC void FUN_02008010(u8 *param0, struct UnkStruct_02006D98_sub *param1)
{
param0[0] = 1;
param0[2] = 0;
param0[1] = (u8)param1->unk0;
param0[3] = param1->unk1;
- ((struct UnkStruct2_sub **)param0)[4] = param1;
+ ((struct UnkStruct_02006D98_sub **)param0)[4] = param1;
for (s32 i = 0; i < 10; i++)
{
@@ -2238,7 +2238,7 @@ THUMB_FUNC s32 FUN_02008030(u8 *param0)
if (*param0 != 0)
{
u8 *r3 = param0 + 2;
- struct UnkStruct2_sub *r4 = ((struct UnkStruct2_sub **)param0)[4];
+ struct UnkStruct_02006D98_sub *r4 = ((struct UnkStruct_02006D98_sub **)param0)[4];
if (*param0 != 0)
{
if (param0[3] == 0)
@@ -2378,19 +2378,19 @@ _020080C6:
}
#endif
-THUMB_FUNC void FUN_020080D0(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_020080D0(struct UnkStruct_02006D98_2 *param0)
{
param0->unk00_7 = 1;
param0->unk00_8 = 1;
}
-THUMB_FUNC void FUN_020080E0(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_020080E0(struct UnkStruct_02006D98_2 *param0)
{
param0->unk14 = param0->unk04;
param0->unk78 = param0->unk6C;
}
-THUMB_FUNC void FUN_0200813C(struct UnkStruct2 *param0)
+THUMB_FUNC void FUN_0200813C(struct UnkStruct_02006D98_2 *param0)
{
param0->unk04 = param0->unk14;
param0->unk6C = param0->unk78;
@@ -2398,13 +2398,13 @@ THUMB_FUNC void FUN_0200813C(struct UnkStruct2 *param0)
param0->unk00_8 = 1;
}
-THUMB_FUNC void FUN_020081A8(struct UnkStruct1 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_020081A8(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2)
{
param0->unk29C = param1;
param0->unk2A0 = param2;
}
-THUMB_FUNC void FUN_020081B4(struct UnkStruct1 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_020081B4(struct UnkStruct_02006D98 *param0, u32 param1, u32 param2)
{
param0->unk2A4 = param1;
param0->unk2A8 = param2;
@@ -2415,7 +2415,7 @@ THUMB_FUNC u32 FUN_020081C0(u32 param0)
return param0 + 4;
}
-THUMB_FUNC void FUN_020081C4(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_020081C4(struct UnkStruct_02006D98 *param0)
{
if (param0->unk2E1 != 0)
{
@@ -2444,28 +2444,28 @@ THUMB_FUNC void FUN_020081C4(struct UnkStruct1 *param0)
}
}
-THUMB_FUNC void FUN_0200825C(struct UnkStruct1 *param0, u8 param1)
+THUMB_FUNC void FUN_0200825C(struct UnkStruct_02006D98 *param0, u8 param1)
{
param0->unk2E3 = param1;
}
-THUMB_FUNC BOOL FUN_02008268(struct UnkStruct2 *param0)
+THUMB_FUNC BOOL FUN_02008268(struct UnkStruct_02006D98_2 *param0)
{
GF_ASSERT(param0);
return param0->unk00_0 != 0;
}
-THUMB_FUNC void FUN_02008284(struct UnkStruct1 *param0, u32 param1)
+THUMB_FUNC void FUN_02008284(struct UnkStruct_02006D98 *param0, u32 param1)
{
param0->unk2E4 |= param1;
}
-THUMB_FUNC void FUN_02008290(struct UnkStruct1 *param0, u32 param1)
+THUMB_FUNC void FUN_02008290(struct UnkStruct_02006D98 *param0, u32 param1)
{
param0->unk2E4 &= (param1 ^ ~0);
}
-THUMB_FUNC void FUN_020082A8(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_020082A8(struct UnkStruct_02006D98 *param0)
{
NNSG2dCharacterData *st58;
int st54;
@@ -2661,7 +2661,7 @@ THUMB_FUNC void FUN_020082A8(struct UnkStruct1 *param0)
param0->unk2E1 = st48;
}
-THUMB_FUNC void FUN_020086F4(struct UnkStruct1 *param0)
+THUMB_FUNC void FUN_020086F4(struct UnkStruct_02006D98 *param0)
{
NNSG2dPaletteData *st18;
int st14, r7;
@@ -2753,7 +2753,7 @@ THUMB_FUNC u8 FUN_020088D8(u8 param0)
return (u8)(((u8)((param0 & 0xf0) >> 4)) | ((u8)(param0 << 4)));
}
-THUMB_FUNC void FUN_020088EC(struct UnkStruct2 *param0, u8 *param1)
+THUMB_FUNC void FUN_020088EC(struct UnkStruct_02006D98_2 *param0, u8 *param1)
{
if (param0->unk04.field_06 != 0)
{
@@ -2763,7 +2763,7 @@ THUMB_FUNC void FUN_020088EC(struct UnkStruct2 *param0, u8 *param1)
THUMB_FUNC void FUN_02008904(u8 *param0, u32 param1, u32 param2)
{
- struct UnkStruct4 *st10;
+ struct UnkStruct_02006D98_3 *st10;
s32 i;
u32 r2;
u8 r0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-21 04:08:57 +0000