summaryrefslogtreecommitdiff
path: root/src/pokenav_unk_8.c
diff options
context:
space:
mode:
authorGriffinR <griffin.richards@comcast.net>2019-12-05 15:33:36 -0500
committerGriffinR <griffin.richards@comcast.net>2019-12-05 15:33:36 -0500
commit548af3c0f1a2807e791fe7bbfe1fc57ddb726c5e (patch)
treee4ef44282b7599b1bdefb729ba33e74d15ba0d86 /src/pokenav_unk_8.c
parent70d1f54ab96235b0e0d07d40526f16449e7cb1e7 (diff)
Document a bit of Match Call
Diffstat (limited to 'src/pokenav_unk_8.c')
-rw-r--r--src/pokenav_unk_8.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/pokenav_unk_8.c b/src/pokenav_unk_8.c
index c52932a79..f3d0b76f9 100644
--- a/src/pokenav_unk_8.c
+++ b/src/pokenav_unk_8.c
@@ -10,6 +10,10 @@
#include "international_string_util.h"
#include "constants/songs.h"
+#define boxId id1 // naming multi-purpose field
+#define monId id2 // naming multi-purpose field
+
+
struct PokenavSub7
{
u32 (*unk0)(struct PokenavSub7 *);
@@ -227,7 +231,7 @@ static s32 sub_81CF0F0(void)
{
struct PokenavSub7 * ptr = GetSubstructPtr(7);
s32 i = GetSelectedMatchCall();
- return ptr->unkPtr->unk4[i].unk6;
+ return ptr->unkPtr->unk4[i].data;
}
static u16 sub_81CF10C(void)
@@ -258,7 +262,7 @@ static u32 sub_81CF134(s32 state)
if (!GetMonData(pokemon, MON_DATA_SANITY_IS_EGG))
{
item.monId = i;
- item.unk6 = GetMonData(pokemon, ptr->unk14);
+ item.data = GetMonData(pokemon, ptr->unk14);
sub_81CF2C4(ptr, &item);
}
}
@@ -290,7 +294,7 @@ static u32 sub_81CF1D8(s32 state)
{
item.boxId = boxId;
item.monId = monId;
- item.unk6 = GetBoxMonDataAt(boxId, monId, ptr->unk14);
+ item.data = GetBoxMonDataAt(boxId, monId, ptr->unk14);
sub_81CF2C4(ptr, &item);
}
boxCount++;
@@ -313,19 +317,19 @@ static u32 sub_81CF278(s32 state)
{
struct PokenavSub7 * ptr = GetSubstructPtr(7);
s32 r6 = ptr->unkPtr->unk0;
- s32 r4 = ptr->unkPtr->unk4[0].unk6;
+ s32 r4 = ptr->unkPtr->unk4[0].data;
s32 i;
- ptr->unkPtr->unk4[0].unk6 = 1;
+ ptr->unkPtr->unk4[0].data = 1;
for (i = 1; i < r6; i++)
{
- if (ptr->unkPtr->unk4[i].unk6 == r4)
+ if (ptr->unkPtr->unk4[i].data == r4)
{
- ptr->unkPtr->unk4[i].unk6 = ptr->unkPtr->unk4[i - 1].unk6;
+ ptr->unkPtr->unk4[i].data = ptr->unkPtr->unk4[i - 1].data;
}
else
{
- r4 = ptr->unkPtr->unk4[i].unk6;
- ptr->unkPtr->unk4[i].unk6 = i + 1;
+ r4 = ptr->unkPtr->unk4[i].data;
+ ptr->unkPtr->unk4[i].data = i + 1;
}
}
ptr->unk18 = 1;
@@ -340,7 +344,7 @@ static void sub_81CF2C4(struct PokenavSub7 *structPtr, struct PokenavMonList *it
while (right != insertionIdx)
{
- if (item->unk6 > structPtr->unkPtr->unk4[insertionIdx].unk6)
+ if (item->data > structPtr->unkPtr->unk4[insertionIdx].data)
right = insertionIdx;
else
left = insertionIdx + 1;