Through daycare_relationship_score (nonmatching)

3 files changed, 292 insertions, 326 deletions

diff --git a/asm/daycare.s b/asm/daycare.s
index 01eb6afc0..65f2aa78e 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -6,329 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80422A0
-sub_80422A0: @ 80422A0
-	push {lr}
-	ldr r0, _080422B0 @ =gSaveBlock1 + 0x2F9C
-	bl sub_80421B0
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080422B0: .4byte gSaveBlock1 + 0x2F9C
-	thumb_func_end sub_80422A0
-
-	thumb_func_start sub_80422B4
-sub_80422B4: @ 80422B4
-	movs r1, 0x8C
-	lsls r1, 1
-	adds r0, r1
-	ldrh r1, [r0]
-	negs r0, r1
-	orrs r0, r1
-	lsrs r0, 31
-	bx lr
-	thumb_func_end sub_80422B4
-
-	thumb_func_start sub_80422C4
-sub_80422C4: @ 80422C4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _080422FC
-	ldr r1, _0804231C @ =gStringVar1
-	adds r0, r6, 0
-	bl GetBoxMonNick
-	adds r0, r6, 0
-	movs r1, 0x3
-	bl GetBoxMonData
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r5, _08042320 @ =gStringVar3
-	adds r0, r6, 0
-	movs r1, 0x7
-	adds r2, r5, 0
-	bl GetBoxMonData
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl ConvertInternationalString
-_080422FC:
-	adds r4, r6, 0
-	adds r4, 0x50
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	cmp r0, 0
-	beq _08042314
-	ldr r1, _08042324 @ =gStringVar2
-	adds r0, r4, 0
-	bl GetBoxMonNick
-_08042314:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804231C: .4byte gStringVar1
-_08042320: .4byte gStringVar3
-_08042324: .4byte gStringVar2
-	thumb_func_end sub_80422C4
-
-	thumb_func_start sub_8042328
-sub_8042328: @ 8042328
-	push {r4-r6,lr}
-	ldr r6, _08042354 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r6]
-	movs r5, 0x64
-	muls r0, r5
-	ldr r4, _08042358 @ =gPlayerParty
-	adds r0, r4
-	ldr r1, _0804235C @ =gStringVar1
-	bl GetBoxMonNick
-	ldrb r0, [r6]
-	muls r0, r5
-	adds r0, r4
-	movs r1, 0xB
-	bl GetBoxMonData
-	lsls r0, 16
-	lsrs r0, 16
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08042354: .4byte gLastFieldPokeMenuOpened
-_08042358: .4byte gPlayerParty
-_0804235C: .4byte gStringVar1
-	thumb_func_end sub_8042328
-
-	thumb_func_start sp0B5_daycare
-sp0B5_daycare: @ 8042360
-	push {lr}
-	ldr r0, _0804236C @ =gSaveBlock1 + 0x2F9C
-	bl sub_80422C4
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0804236C: .4byte gSaveBlock1 + 0x2F9C
-	thumb_func_end sp0B5_daycare
-
-	thumb_func_start sp0B6_daycare
-sp0B6_daycare: @ 8042370
-	push {r4,lr}
-	ldr r4, _08042384 @ =gSaveBlock1 + 0x2F9C
-	adds r0, r4, 0
-	bl sub_80422B4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08042388
-	movs r0, 0x1
-	b _080423A0
-	.align 2, 0
-_08042384: .4byte gSaveBlock1 + 0x2F9C
-_08042388:
-	adds r0, r4, 0
-	bl Daycare_CountPokemon
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	bne _0804239A
-	movs r0, 0
-	b _080423A0
-_0804239A:
-	adds r0, 0x1
-	lsls r0, 24
-	lsrs r0, 24
-_080423A0:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sp0B6_daycare
-
-	thumb_func_start sub_80423A8
-sub_80423A8: @ 80423A8
-	push {r4-r6,lr}
-	adds r5, r1, 0
-	movs r4, 0
-	adds r1, r0, 0
-_080423B0:
-	movs r3, 0
-	ldrh r0, [r1]
-	adds r2, r5, 0
-_080423B6:
-	ldrh r6, [r2]
-	cmp r0, r6
-	bne _080423C0
-	movs r0, 0x1
-	b _080423D2
-_080423C0:
-	adds r2, 0x2
-	adds r3, 0x1
-	cmp r3, 0x1
-	ble _080423B6
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x1
-	ble _080423B0
-	movs r0, 0
-_080423D2:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80423A8
-
-	thumb_func_start daycare_relationship_score
-daycare_relationship_score: @ 80423D8
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x2C
-	movs r1, 0
-	mov r8, r1
-	mov r2, sp
-	adds r2, 0x8
-	str r2, [sp, 0x1C]
-	add r1, sp, 0xC
-	mov r10, r1
-	adds r2, 0xC
-	str r2, [sp, 0x20]
-	mov r1, sp
-	adds r1, 0x2
-	ldr r2, _08042488 @ =gBaseStats
-	mov r9, r2
-	ldr r5, [sp, 0x1C]
-	adds r7, r1, 0
-	mov r6, sp
-	ldr r1, [sp, 0x20]
-	str r1, [sp, 0x24]
-	mov r2, r10
-	str r2, [sp, 0x28]
-	adds r4, r0, 0
-_0804240E:
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetBoxMonData
-	strh r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetBoxMonData
-	ldr r1, [sp, 0x28]
-	stm r1!, {r0}
-	str r1, [sp, 0x28]
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetBoxMonData
-	adds r1, r0, 0
-	ldrh r0, [r5]
-	bl GetGenderFromSpeciesAndPersonality
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, [sp, 0x24]
-	stm r2!, {r0}
-	str r2, [sp, 0x24]
-	ldrh r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r9
-	ldrb r0, [r0, 0x14]
-	strh r0, [r6]
-	ldrh r1, [r5]
-	lsls r0, r1, 3
-	subs r0, r1
-	lsls r0, 2
-	add r0, r9
-	ldrb r0, [r0, 0x15]
-	strh r0, [r7]
-	adds r5, 0x2
-	adds r7, 0x4
-	adds r6, 0x4
-	adds r4, 0x50
-	movs r0, 0x1
-	add r8, r0
-	mov r1, r8
-	cmp r1, 0x1
-	bls _0804240E
-	mov r0, sp
-	ldrh r1, [r0]
-	cmp r1, 0xF
-	beq _08042484
-	ldrh r0, [r0, 0x4]
-	cmp r0, 0xF
-	beq _08042484
-	cmp r1, 0xD
-	bne _0804248C
-	cmp r0, 0xD
-	bne _08042490
-_08042484:
-	movs r0, 0
-	b _080424E4
-	.align 2, 0
-_08042488: .4byte gBaseStats
-_0804248C:
-	cmp r0, 0xD
-	bne _0804249C
-_08042490:
-	ldr r1, [sp, 0xC]
-	mov r2, r10
-	ldr r0, [r2, 0x4]
-	cmp r1, r0
-	beq _080424DE
-	b _080424E2
-_0804249C:
-	ldr r0, [sp, 0x14]
-	ldr r2, [sp, 0x20]
-	ldr r1, [r2, 0x4]
-	cmp r0, r1
-	beq _08042484
-	cmp r0, 0xFF
-	beq _08042484
-	cmp r1, 0xFF
-	beq _08042484
-	add r1, sp, 0x4
-	mov r0, sp
-	bl sub_80423A8
-	lsls r0, 24
-	cmp r0, 0
-	beq _08042484
-	ldr r0, [sp, 0x1C]
-	ldrh r1, [r0, 0x2]
-	ldrh r0, [r0]
-	cmp r0, r1
-	bne _080424D4
-	ldr r1, [sp, 0xC]
-	mov r2, r10
-	ldr r0, [r2, 0x4]
-	cmp r1, r0
-	beq _080424E2
-	movs r0, 0x46
-	b _080424E4
-_080424D4:
-	ldr r1, [sp, 0xC]
-	mov r2, r10
-	ldr r0, [r2, 0x4]
-	cmp r1, r0
-	bne _080424E2
-_080424DE:
-	movs r0, 0x14
-	b _080424E4
-_080424E2:
-	movs r0, 0x32
-_080424E4:
-	add sp, 0x2C
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end daycare_relationship_score
-
 	thumb_func_start daycare_relationship_score_from_savegame
 daycare_relationship_score_from_savegame: @ 80424F4
 	push {lr}
diff --git a/include/daycare.h b/include/daycare.h
index 59d10e18f..912b49649 100644
--- a/include/daycare.h
+++ b/include/daycare.h
@@ -1,7 +1,7 @@
 #ifndef GUARD_DAYCARE_H
 #define GUARD_DAYCARE_H
 
-u8 Daycare_CountPokemon(struct BoxPokemon *);
+u8 Daycare_CountPokemon(struct DayCareData *);
 void sub_8041324(struct BoxPokemon *, struct DayCareMailEtc *);
 void sub_8041790(u16 i);
 u16 sub_8041870(u16);
diff --git a/src/daycare.c b/src/daycare.c
index 5efec9810..e0dc83962 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -47,13 +47,13 @@ u8 *GetBoxMonNick(struct BoxPokemon *mon, u8 *dest)
     return StringCopy10(dest, nickname);
 }
 
-u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
+u8 Daycare_CountPokemon(struct DayCareData *daycare_data)
 {
     u8 i, count;
     count = 0;
 
     for(i = 0;i <= 1;i++)
-        if(GetBoxMonData(daycare_data + i, MON_DATA_SPECIES) != 0)
+        if(GetBoxMonData(&daycare_data->mons[i], MON_DATA_SPECIES) != 0)
             count++;
 
     return count;
@@ -1151,3 +1151,292 @@ bool8 sub_80421B0(struct DayCareData *dayCareData)
                     "_0804229C: .4byte gPlayerPartyCount");
 }
 #endif
+
+bool8 sub_80422A0(void)
+{
+    return sub_80421B0(&gSaveBlock1.daycareData);
+}
+
+bool8 sub_80422B4(struct DayCareData *dayCareData)
+{
+    return (u32)((-dayCareData->mail.extra.egg.personalityLo) | dayCareData->mail.extra.egg.personalityLo) >> 31;
+}
+
+void sub_80422C4(struct DayCareData *dayCareData)
+{
+    u8 language;
+    if (GetBoxMonData(&dayCareData->mons[0], MON_DATA_SPECIES) != 0)
+    {
+        GetBoxMonNick(&dayCareData->mons[0], gStringVar1);
+        language = GetBoxMonData(&dayCareData->mons[0], MON_DATA_LANGUAGE);
+        GetBoxMonData(&dayCareData->mons[0], MON_DATA_OT_NAME, gStringVar3);
+        ConvertInternationalString(gStringVar3, language);
+    }
+    if (GetBoxMonData(&dayCareData->mons[1], MON_DATA_SPECIES) != 0)
+    {
+        GetBoxMonNick(&dayCareData->mons[1], gStringVar2);
+    }
+}
+
+u16 sub_8042328(void)
+{
+    GetBoxMonNick(&gPlayerParty[gLastFieldPokeMenuOpened].box, gStringVar1);
+    return GetBoxMonData(&gPlayerParty[gLastFieldPokeMenuOpened].box, MON_DATA_SPECIES);
+}
+
+void sp0B5_daycare(void)
+{
+    sub_80422C4(&gSaveBlock1.daycareData);
+}
+
+u8 sp0B6_daycare(void)
+{
+    u8 monCount;
+    if (sub_80422B4(&gSaveBlock1.daycareData))
+    {
+        return 1;
+    }
+    monCount = Daycare_CountPokemon(&gSaveBlock1.daycareData);
+    if (monCount != 0)
+    {
+        return monCount + 1;
+    }
+    return 0;
+}
+
+bool8 sub_80423A8(u16 *a, u16 *b)
+{
+    int i, j;
+    u16 *v0, *v1, v2;
+    for (i=0, v0=a; i<2; v0++, i++)
+    {
+        for (j=0, v2=*v0, v1=b; j<2; v1++, j++)
+        {
+            if (v2 == *v1)
+            {
+                return TRUE;
+            }
+        }
+    }
+    return FALSE;
+}
+
+#ifdef NONMATCHING
+u8 daycare_relationship_score(struct DayCareData *dayCareData)
+{
+    u16 species[2];
+    u32 otIds[2];
+    u32 genders[2];
+    u16 eggGroups[2][2];
+    int i;
+    u16 *spc;
+    u32 *ids;
+    u32 *gnd;
+    u16 *egg1;
+    u16 *egg2;
+    struct BoxPokemon *parent;
+    for (i=0, parent=&dayCareData->mons[0], spc=species, ids=otIds, gnd=genders, egg1=&eggGroups[0][0], egg2=&eggGroups[0][1]; i<2; spc++, egg1+=2, egg2+=2, parent++, i++)
+    {
+        *spc = GetBoxMonData(parent, MON_DATA_SPECIES);
+        *ids++ = GetBoxMonData(parent, MON_DATA_OT_ID);
+        *gnd++ = GetGenderFromSpeciesAndPersonality(*spc, GetBoxMonData(parent, MON_DATA_PERSONALITY));
+        *egg1 = gBaseStats[*spc].eggGroup1;
+        *egg2 = gBaseStats[*spc].eggGroup2;
+    }
+    if (eggGroups[0][0] == 0xf)
+    {
+        return 0;
+    }
+    if (eggGroups[1][0] == 0xf)
+    {
+        return 0;
+    }
+    if (eggGroups[0][0] == 0xd && eggGroups[1][0] == 0xd)
+    {
+        return 0;
+    }
+    else if (eggGroups[0][0] == 0xd || eggGroups[1][0] == 0xd)
+    {
+        if (otIds[0] == otIds[1])
+        {
+            return 20;
+        }
+        return 50;
+    }
+    if (genders[0] == genders[1] || genders[0] == MON_GENDERLESS || genders[1] == MON_GENDERLESS)
+    {
+        return 0;
+    }
+    if (!sub_80423A8(eggGroups[0], eggGroups[1]))
+    {
+        return 0;
+    }
+    if (species[0] == species[1])
+    {
+        if (otIds[0] == otIds[1])
+        {
+            return 50;
+        }
+        return 70;
+    }
+    else
+    {
+        if (otIds[0] != otIds[1])
+        {
+            return 50;
+        }
+        return 20;
+    }
+}
+#else
+__attribute__((naked))
+u8 daycare_relationship_score(struct DayCareData *dayCareData)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x2C\n"
+                    "\tmovs r1, 0\n"
+                    "\tmov r8, r1\n"
+                    "\tmov r2, sp\n"
+                    "\tadds r2, 0x8\n"
+                    "\tstr r2, [sp, 0x1C]\n"
+                    "\tadd r1, sp, 0xC\n"
+                    "\tmov r10, r1\n"
+                    "\tadds r2, 0xC\n"
+                    "\tstr r2, [sp, 0x20]\n"
+                    "\tmov r1, sp\n"
+                    "\tadds r1, 0x2\n"
+                    "\tldr r2, _08042488 @ =gBaseStats\n"
+                    "\tmov r9, r2\n"
+                    "\tldr r5, [sp, 0x1C]\n"
+                    "\tadds r7, r1, 0\n"
+                    "\tmov r6, sp\n"
+                    "\tldr r1, [sp, 0x20]\n"
+                    "\tstr r1, [sp, 0x24]\n"
+                    "\tmov r2, r10\n"
+                    "\tstr r2, [sp, 0x28]\n"
+                    "\tadds r4, r0, 0\n"
+                    "_0804240E:\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0xB\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tstrh r0, [r5]\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x1\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tldr r1, [sp, 0x28]\n"
+                    "\tstm r1!, {r0}\n"
+                    "\tstr r1, [sp, 0x28]\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tldrh r0, [r5]\n"
+                    "\tbl GetGenderFromSpeciesAndPersonality\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tldr r2, [sp, 0x24]\n"
+                    "\tstm r2!, {r0}\n"
+                    "\tstr r2, [sp, 0x24]\n"
+                    "\tldrh r1, [r5]\n"
+                    "\tlsls r0, r1, 3\n"
+                    "\tsubs r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadd r0, r9\n"
+                    "\tldrb r0, [r0, 0x14]\n"
+                    "\tstrh r0, [r6]\n"
+                    "\tldrh r1, [r5]\n"
+                    "\tlsls r0, r1, 3\n"
+                    "\tsubs r0, r1\n"
+                    "\tlsls r0, 2\n"
+                    "\tadd r0, r9\n"
+                    "\tldrb r0, [r0, 0x15]\n"
+                    "\tstrh r0, [r7]\n"
+                    "\tadds r5, 0x2\n"
+                    "\tadds r7, 0x4\n"
+                    "\tadds r6, 0x4\n"
+                    "\tadds r4, 0x50\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tadd r8, r0\n"
+                    "\tmov r1, r8\n"
+                    "\tcmp r1, 0x1\n"
+                    "\tbls _0804240E\n"
+                    "\tmov r0, sp\n"
+                    "\tldrh r1, [r0]\n"
+                    "\tcmp r1, 0xF\n"
+                    "\tbeq _08042484\n"
+                    "\tldrh r0, [r0, 0x4]\n"
+                    "\tcmp r0, 0xF\n"
+                    "\tbeq _08042484\n"
+                    "\tcmp r1, 0xD\n"
+                    "\tbne _0804248C\n"
+                    "\tcmp r0, 0xD\n"
+                    "\tbne _08042490\n"
+                    "_08042484:\n"
+                    "\tmovs r0, 0\n"
+                    "\tb _080424E4\n"
+                    "\t.align 2, 0\n"
+                    "_08042488: .4byte gBaseStats\n"
+                    "_0804248C:\n"
+                    "\tcmp r0, 0xD\n"
+                    "\tbne _0804249C\n"
+                    "_08042490:\n"
+                    "\tldr r1, [sp, 0xC]\n"
+                    "\tmov r2, r10\n"
+                    "\tldr r0, [r2, 0x4]\n"
+                    "\tcmp r1, r0\n"
+                    "\tbeq _080424DE\n"
+                    "\tb _080424E2\n"
+                    "_0804249C:\n"
+                    "\tldr r0, [sp, 0x14]\n"
+                    "\tldr r2, [sp, 0x20]\n"
+                    "\tldr r1, [r2, 0x4]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbeq _08042484\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbeq _08042484\n"
+                    "\tcmp r1, 0xFF\n"
+                    "\tbeq _08042484\n"
+                    "\tadd r1, sp, 0x4\n"
+                    "\tmov r0, sp\n"
+                    "\tbl sub_80423A8\n"
+                    "\tlsls r0, 24\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _08042484\n"
+                    "\tldr r0, [sp, 0x1C]\n"
+                    "\tldrh r1, [r0, 0x2]\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbne _080424D4\n"
+                    "\tldr r1, [sp, 0xC]\n"
+                    "\tmov r2, r10\n"
+                    "\tldr r0, [r2, 0x4]\n"
+                    "\tcmp r1, r0\n"
+                    "\tbeq _080424E2\n"
+                    "\tmovs r0, 0x46\n"
+                    "\tb _080424E4\n"
+                    "_080424D4:\n"
+                    "\tldr r1, [sp, 0xC]\n"
+                    "\tmov r2, r10\n"
+                    "\tldr r0, [r2, 0x4]\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _080424E2\n"
+                    "_080424DE:\n"
+                    "\tmovs r0, 0x14\n"
+                    "\tb _080424E4\n"
+                    "_080424E2:\n"
+                    "\tmovs r0, 0x32\n"
+                    "_080424E4:\n"
+                    "\tadd sp, 0x2C\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1");
+}
+#endif