summaryrefslogtreecommitdiff
path: root/src/quest_log.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-10-11 16:21:47 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2018-10-11 16:21:47 -0400
commitfeadfc8911db9bde3bc8678ea0a5d9bab0aeef15 (patch)
tree8832b8b7e78d75685d298a1cb11c371c38a3c3a8 /src/quest_log.c
parent3310b1445ac759a042776d8931cfe8d7dec46bd5 (diff)
through sub_811164C
Diffstat (limited to 'src/quest_log.c')
-rw-r--r--src/quest_log.c42
1 files changed, 40 insertions, 2 deletions
diff --git a/src/quest_log.c b/src/quest_log.c
index b1f1dc870..7ed5e0560 100644
--- a/src/quest_log.c
+++ b/src/quest_log.c
@@ -740,9 +740,9 @@ void sub_8111438(void)
}
else if (r5 < r9->unk_66)
{
- for (r3 = 0; r3 < 14; r3++)
+ for (r3 = 0; r3 < TOTAL_BOXES_COUNT; r3++)
{
- for (r6 = 0; r6 < 30; r6++)
+ for (r6 = 0; r6 < IN_BOX_COUNT; r6++)
{
struct BoxPokemon * boxMon = GetBoxedMonPtr(r3, r6);
if (!GetBoxMonData(boxMon, MON_DATA_SANITY_BIT2))
@@ -760,3 +760,41 @@ void sub_8111438(void)
Free(r9);
}
+
+void sub_81115E8(void)
+{
+ u16 r4 = sub_8111618();
+ u16 r1 = sub_811164C();
+ VarSet(VAR_0x4027, (r4 << 12) + r1);
+}
+
+u16 sub_8111618(void)
+{
+ u16 count = 0;
+ u16 i;
+
+ for (i = 0; i < PARTY_SIZE; i++)
+ {
+ if (GetMonData(&gPlayerParty[i], MON_DATA_SANITY_BIT2))
+ count++;
+ }
+
+ return count;
+}
+
+u16 sub_811164C(void)
+{
+ u16 count = 0;
+ u16 i, j;
+
+ for (i = 0; i < TOTAL_BOXES_COUNT; i++)
+ {
+ for (j = 0; j < IN_BOX_COUNT; j++)
+ {
+ if (GetBoxMonDataFromAnyBox(i, j, MON_DATA_SANITY_BIT2))
+ count++;
+ }
+ }
+
+ return count;
+}