From f25a1e6106fef11318301666359ee5ec2d45677f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 22:14:29 -0400
Subject: Daycare_SendPokemon

---
 src/daycare.c         | 151 ++++++++++----------------------------------------
 src/mori_debug_menu.c |   6 +-
 src/record_mixing.c   |  32 +++++------
 3 files changed, 49 insertions(+), 140 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index cded18207..64eac981e 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -4,6 +4,9 @@
 #include "species.h"
 #include "items.h"
 #include "string_util.h"
+#include "mail_data.h"
+#include "name_string_util.h"
+#include "pokemon_storage_system.h"
 
 extern u8 gLastFieldPokeMenuOpened;
 
@@ -35,7 +38,7 @@ u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
     return count;
 }
 
-void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixing_UnknownStruct * void_pointer)
+void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * void_pointer)
 {
     u8 i;
     u8 specCount;
@@ -47,17 +50,17 @@ void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixing_UnknownStr
             specCount ++;
             if (GetBoxMonData(&box_pokemon[i], MON_DATA_HELD_ITEM) == ITEM_NONE)
             {
-                void_pointer->unk74[i] = 0;
+                void_pointer->extra.rc.unk74[i] = 0;
             } else
             {
-                void_pointer->unk74[i] = 1;
+                void_pointer->extra.rc.unk74[i] = 1;
             }
         } else
         {
-            void_pointer->unk74[i] = 1;
+            void_pointer->extra.rc.unk74[i] = 1;
         }
     }
-    void_pointer->unk70 = specCount;
+    void_pointer->extra.rc.unk70 = specCount;
 }
 
 s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
@@ -71,126 +74,32 @@ s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
     return -1;
 }
 
-/*void Daycare_SendPokemon(struct Pokemon * mon, struct BoxPokemon * daycare_data){ // unfinished
+void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * daycare_data){ // unfinished
     s8 empty_slot;
+    u8 mail;
+    u8 *names;
 
-    empty_slot = Daycare_FindEmptySpot(daycare_data);
-    if(MonHasMail(mon) != 0){ // if the mon holds a mail?
-        u8 empty_slot_times_56 = empty_slot * 56;
-        u8 * something2 = ((u8 *) (daycare_data + 2)) + empty_slot_times_56 + 36;
-        StringCopy(something2, gSaveBlock2.playerName);
-        PadNameString(something2, 0xFC);
-        something2 += 8;
-        GetMonNick(mon, something2);
-        u8 pokerus = GetMonData(mon, MON_DATA_64);
-        something1 += (u8 * daycare_data)
-}*/
-
-__attribute__((naked))
-void Daycare_SendPokemon()
-{
-    // strange stack usage - happens because THUMB ARM only allows R0-R7 to be pushed/popped:
-    //    all registers in reglist must be Lo registers, except that PUSH can include the LR, and POP can include the PC
-    // the ldm/stm section probably copies some struct, but I'm not sure how the code would look
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    adds r7, r0, 0\n\
-    mov r8, r1\n\
-    mov r0, r8\n\
-    bl Daycare_FindEmptySpot\n\
-    lsls r0, 24\n\
-    lsrs r4, r0, 24\n\
-    mov r9, r4\n\
-    adds r0, r7, 0\n\
-    bl MonHasMail\n\
-    lsls r0, 24\n\
-    cmp r0, 0\n\
-    beq _0804144A\n\
-    lsls r0, r4, 24\n\
-    asrs r0, 24\n\
-    lsls r4, r0, 3\n\
-    subs r4, r0\n\
-    lsls r4, 3\n\
-    adds r5, r4, 0\n\
-    adds r5, 0xA0\n\
-    add r5, r8\n\
-    adds r6, r5, 0\n\
-    adds r6, 0x24\n\
-    ldr r1, _08041490 @ =gSaveBlock2\n\
-    adds r0, r6, 0\n\
-    bl StringCopy\n\
-    adds r0, r6, 0\n\
-    movs r1, 0xFC\n\
-    bl PadNameString\n\
-    adds r6, 0x8\n\
-    adds r0, r7, 0\n\
-    adds r1, r6, 0\n\
-    bl GetMonNick\n\
-    adds r0, r7, 0\n\
-    movs r1, 0x40\n\
-    bl GetMonData\n\
-    lsls r0, 24\n\
-    lsrs r0, 24\n\
-    add r4, r8\n\
-    ldr r2, _08041494 @ =gSaveBlock1\n\
-    lsls r1, r0, 3\n\
-    adds r1, r0\n\
-    lsls r1, 2\n\
-    adds r1, r2\n\
-    adds r4, 0xA0\n\
-    ldr r0, _08041498 @ =0x00002b4c\n\
-    adds r1, r0\n\
-    ldm r1!, {r0,r2,r3}\n\
-    stm r4!, {r0,r2,r3}\n\
-    ldm r1!, {r0,r2,r3}\n\
-    stm r4!, {r0,r2,r3}\n\
-    ldm r1!, {r0,r2,r3}\n\
-    stm r4!, {r0,r2,r3}\n\
-    adds r0, r7, 0\n\
-    bl TakeMailFromMon\n\
-_0804144A:\n\
-    mov r2, r9\n\
-    lsls r4, r2, 24\n\
-    asrs r4, 24\n\
-    lsls r5, r4, 2\n\
-    adds r4, r5, r4\n\
-    lsls r4, 4\n\
-    add r4, r8\n\
-    adds r0, r4, 0\n\
-    adds r1, r7, 0\n\
-    movs r2, 0x50\n\
-    bl memcpy\n\
-    adds r0, r4, 0\n\
-    bl BoxMonRestorePP\n\
-    movs r0, 0x88\n\
-    lsls r0, 1\n\
-    add r0, r8\n\
-    adds r0, r5\n\
-    movs r1, 0\n\
-    str r1, [r0]\n\
-    adds r0, r7, 0\n\
-    bl ZeroMonData\n\
-    bl party_compaction\n\
-    bl CalculatePlayerPartyCount\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r0}\n\
-    bx r0\n\
-    .align 2, 0\n\
-_08041490: .4byte gSaveBlock2\n\
-_08041494: .4byte gSaveBlock1\n\
-_08041498: .4byte 0x00002b4c\n\
-    .syntax divided\n");
+    empty_slot = Daycare_FindEmptySpot(daycare_data->mons);
+    if(MonHasMail(mon)) {
+        StringCopy((names = daycare_data->mail.data[empty_slot].names), gSaveBlock2.playerName);
+        PadNameString(names, 0xFC);
+        names += 8;
+        GetMonNick(mon, names);
+        mail = GetMonData(mon, MON_DATA_MAIL);
+        daycare_data->mail.data[empty_slot].mail = gSaveBlock1.mail[mail];
+        TakeMailFromMon(mon);
+    }
+    daycare_data->mons[empty_slot] = mon->box;
+    BoxMonRestorePP(&daycare_data->mons[empty_slot]);
+    daycare_data->mail.extra.unk70[empty_slot] = 0;
+    ZeroMonData(mon);
+    party_compaction();
+    CalculatePlayerPartyCount();
 }
 
 void Daycare_SendPokemon_Special()
 {
-    Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, gSaveBlock1.daycareData);
+    Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, &gSaveBlock1.daycareData);
 }
 
 void sub_80417F4(u8 *);
@@ -235,7 +144,7 @@ void sub_804151C(struct Pokemon * mon)
 }
 
 __attribute__((naked))
-u16 sub_8041570(struct BoxPokemon * daycare_data, u8 a2){
+u16 sub_8041570(struct DayCareData * daycare_data, u8 a2){
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
     mov r7, r9\n\
@@ -339,7 +248,7 @@ extern u8 gSpecialVar_0x8004;
 
 u16 sub_8041648()
 {
-    return sub_8041570(gSaveBlock1.daycareData, gSpecialVar_0x8004);
+    return sub_8041570(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
 }
 
 u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 4eadaa78b..abb09d889 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -67,7 +67,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
 
 s8 MoriDebugMenu_Egg(void)
 {
-    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData.mons) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041940();
     CloseMenu();
 
@@ -76,7 +76,7 @@ s8 MoriDebugMenu_Egg(void)
 
 s8 MoriDebugMenu_MaleEgg(void)
 {
-    if ( Daycare_CountPokemon(gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(gSaveBlock1.daycareData.mons) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041950();
     CloseMenu();
 
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.filler_30B6 = -3;
+    gSaveBlock1.daycareData.extra.unk_2 = -3;
     CloseMenu();
     return 1;
 }
diff --git a/src/record_mixing.c b/src/record_mixing.c
index d1083910c..aa6d2c5a9 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -29,7 +29,7 @@ extern u8 ewram[];
 #define unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000))
 #define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000))
 
-extern struct RecordMixing_UnknownStruct gUnknown_02038738;
+extern struct DayCareMailEtc gUnknown_02038738;
 extern u16 gSpecialVar_0x8005;
 
 u32 gUnknown_03005D2C;
@@ -42,7 +42,7 @@ void *recordMixingTvShows = &gSaveBlock1.tvShows;
 void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
 void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
-struct RecordMixing_UnknownStruct *gUnknown_083D0280 = &gUnknown_02038738;
+struct DayCareMailEtc *gUnknown_083D0280 = &gUnknown_02038738;
 void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
 
 #define BUFFER_CHUNK_SIZE 200
@@ -59,7 +59,7 @@ struct PlayerRecords
     u8 filler1004[0x40];
     u8 filler1044[0x40];
     struct EasyChatPair easyChatPairs[5];
-    struct RecordMixing_UnknownStruct filler10AC;
+    struct DayCareMailEtc filler10AC;
     u8 filler1124[0xA4];
     u16 filler11C8[0x34];
 };
@@ -74,10 +74,10 @@ void RecordMixing_PrepareExchangePacket(void)
     memcpy(unk_2018000.filler1004, gUnknown_083D0274, sizeof(unk_2008000.filler1004));
     memcpy(unk_2018000.filler1044, gUnknown_083D0278, sizeof(unk_2008000.filler1044));
     memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(unk_2018000.easyChatPairs));
-    gUnknown_02038738.data[0] = gSaveBlock1.filler_303C.data[0];
-    gUnknown_02038738.data[1] = gSaveBlock1.filler_303C.data[1];
-    sub_8041324(gSaveBlock1.daycareData, &gUnknown_02038738);
-    memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixing_UnknownStruct));
+    gUnknown_02038738.data[0] = gSaveBlock1.daycareData.mail.data[0];
+    gUnknown_02038738.data[1] = gSaveBlock1.daycareData.mail.data[1];
+    sub_8041324(gSaveBlock1.daycareData.mons, &gUnknown_02038738);
+    memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct DayCareMailEtc));
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, sizeof(unk_2018000.filler1124));
 
     if (GetMultiplayerId() == 0)
@@ -461,10 +461,10 @@ u8 sub_80B9BBC(u16 *a)
 
 void sub_80B9BC4(u8 *a, size_t b, u8 c[][2], u8 d, u8 e)
 {
-    struct RecordMixing_UnknownStructSub *r6 = (struct RecordMixing_UnknownStructSub *)(a + b * c[d][0]);
-    struct RecordMixing_UnknownStructSub *src = r6 + c[d][1];
-    struct RecordMixing_UnknownStructSub sp0 = *src;
-    struct RecordMixing_UnknownStructSub *r8 = (struct RecordMixing_UnknownStructSub *)(a + b * c[e][0]);
+    struct DayCareMail *r6 = (struct DayCareMail *)(a + b * c[d][0]);
+    struct DayCareMail *src = r6 + c[d][1];
+    struct DayCareMail sp0 = *src;
+    struct DayCareMail *r8 = (struct DayCareMail *)(a + b * c[e][0]);
 
     r6 += c[d][1];
     *r6 = *(r8 + c[e][1]);
@@ -511,7 +511,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     u16 i;  // r3
     u16 r7;
     u8 r1;
-    struct RecordMixing_UnknownStruct *r6;
+    struct DayCareMailEtc *r6;
 
     //asm("":::"r8");
     SeedRng(gLinkPlayers[0].trainerId);
@@ -526,7 +526,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     sp3C = 0;
     for (i = 0; i < r8; i++)
     {
-        r6 = (struct RecordMixing_UnknownStruct *)(a + b * i);
+        r6 = (struct DayCareMailEtc *)(a + b * i);
         if (r6->unk70 != 0)
         {
             for (r7 = 0; r7 < r6->unk70; r7++)
@@ -540,7 +540,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9D46
     for (r7 = 0, i = 0; i < r8; i++)
     {
-        r6 = (struct RecordMixing_UnknownStruct *)(a + b * i);
+        r6 = (struct DayCareMailEtc *)(a + b * i);
         if (sp1C[i][0] == 1 || sp1C[i][1] == 1)
             sp3C++;
         if (sp1C[i][0] == 1 && sp1C[i][1] == 0)
@@ -596,7 +596,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9E3E
     for (i = 0; i < 4; i++)
     {
-        r6 = (struct RecordMixing_UnknownStruct *)a + b * c;
+        r6 = (struct DayCareMailEtc *)a + b * c;
         spC[i] = r6;
     }
     r1 = sub_80B9C4C(d) % 3;
@@ -630,7 +630,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9EF0
     //memcpy(&gSaveBlock1.filler_303C.data[0], a + b * c, 0x38);
     //memcpy(&gSaveBlock1.filler_303C.data[1], a + b * c + 0x38, 0x38);
-    r6 = (struct RecordMixing_UnknownStruct *)(a + b * c);
+    r6 = (struct DayCareMailEtc *)(a + b * c);
     gSaveBlock1.filler_303C.data[0] = r6->data[0];
     gSaveBlock1.filler_303C.data[1] = r6->data[1];
     //memcpy(&gSaveBlock1.filler_303C.data[0], &r6->data[0], 0x38);
-- 
cgit v1.2.3


From 36bafa9f9fad1efd7baead651c7f357f6a832023 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 22:41:26 -0400
Subject: sub_8041570

---
 src/daycare.c   | 149 +++++++++++++++-----------------------------------------
 src/pokemon_1.c |   4 +-
 2 files changed, 41 insertions(+), 112 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 64eac981e..2f30c1479 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -3,6 +3,7 @@
 #include "pokemon.h"
 #include "species.h"
 #include "items.h"
+#include "text.h"
 #include "string_util.h"
 #include "mail_data.h"
 #include "name_string_util.h"
@@ -91,7 +92,7 @@ void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * daycare_data
     }
     daycare_data->mons[empty_slot] = mon->box;
     BoxMonRestorePP(&daycare_data->mons[empty_slot]);
-    daycare_data->mail.extra.unk70[empty_slot] = 0;
+    daycare_data->mail.extra.steps[empty_slot] = 0;
     ZeroMonData(mon);
     party_compaction();
     CalculatePlayerPartyCount();
@@ -102,18 +103,18 @@ void Daycare_SendPokemon_Special()
     Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, &gSaveBlock1.daycareData);
 }
 
-void sub_80417F4(u8 *);
+void sub_80417F4(struct MailStruct *);
 
-void sub_80414C0(struct BoxPokemon * daycare_data)
+void sub_80414C0(struct DayCareData * daycare_data)
 {
-    u32 second_species;
-    if((GetBoxMonData(&daycare_data[1], MON_DATA_SPECIES) != 0) && ((second_species = GetBoxMonData(&daycare_data[0], MON_DATA_SPECIES)) == 0)){
-        daycare_data[0] = daycare_data[1];
-        ZeroBoxMonData(&daycare_data[1]);
-        memcpy(daycare_data + 2, (u8 *) (daycare_data + 1) + 0x88, 0x38);
-        *((u32 *)(daycare_data) + 68) = *((u32 *)(daycare_data) + 69);
-        *((u32 *)(daycare_data) + 69) = second_species;
-        sub_80417F4((u8 *) (daycare_data + 1) + 0x88);
+    if((GetBoxMonData(&daycare_data->mons[1], MON_DATA_SPECIES) != 0) && GetBoxMonData(&daycare_data->mons[0], MON_DATA_SPECIES) == 0)
+    {
+        daycare_data->mons[0] = daycare_data->mons[1];
+        ZeroBoxMonData(&daycare_data->mons[1]);
+        daycare_data->mail.data[0] = daycare_data->mail.data[1];
+        daycare_data->mail.extra.steps[0] = daycare_data->mail.extra.steps[1];
+        daycare_data->mail.extra.steps[1] = 0;
+        sub_80417F4(&daycare_data->mail.data[1].mail);
     }
 }
 
@@ -143,105 +144,33 @@ void sub_804151C(struct Pokemon * mon)
     CalculateMonStats(mon);
 }
 
-__attribute__((naked))
-u16 sub_8041570(struct DayCareData * daycare_data, u8 a2){
-    asm(".syntax unified\n\
-    push {r4-r7,lr}\n\
-    mov r7, r9\n\
-    mov r6, r8\n\
-    push {r6,r7}\n\
-    sub sp, 0x68\n\
-    adds r5, r0, 0\n\
-    lsls r1, 24\n\
-    lsrs r4, r1, 24\n\
-    lsls r7, r4, 2\n\
-    adds r0, r7, r4\n\
-    lsls r0, 4\n\
-    adds r6, r5, r0\n\
-    ldr r1, _08041640 @ =gStringVar1\n\
-    adds r0, r6, 0\n\
-    bl GetBoxMonNick\n\
-    adds r0, r6, 0\n\
-    movs r1, 0xB\n\
-    bl GetBoxMonData\n\
-    lsls r0, 16\n\
-    lsrs r0, 16\n\
-    mov r9, r0\n\
-    adds r0, r6, 0\n\
-    mov r1, sp\n\
-    bl sub_803B4B4\n\
-    mov r0, sp\n\
-    movs r1, 0x38\n\
-    bl GetMonData\n\
-    cmp r0, 0x64\n\
-    beq _080415D8\n\
-    mov r0, sp\n\
-    movs r1, 0x19\n\
-    bl GetMonData\n\
-    movs r2, 0x88\n\
-    lsls r2, 1\n\
-    adds r1, r5, r2\n\
-    adds r1, r7\n\
-    ldr r1, [r1]\n\
-    adds r0, r1\n\
-    str r0, [sp, 0x64]\n\
-    add r2, sp, 0x64\n\
-    mov r0, sp\n\
-    movs r1, 0x19\n\
-    bl SetMonData\n\
-    mov r0, sp\n\
-    bl sub_804151C\n\
-_080415D8:\n\
-    ldr r0, _08041644 @ =gPlayerParty\n\
-    movs r1, 0xFA\n\
-    lsls r1, 1\n\
-    adds r1, r0\n\
-    mov r8, r1\n\
-    mov r0, r8\n\
-    mov r1, sp\n\
-    movs r2, 0x64\n\
-    bl memcpy\n\
-    lsls r0, r4, 3\n\
-    subs r0, r4\n\
-    lsls r1, r0, 3\n\
-    adds r0, r5, r1\n\
-    adds r0, 0xC0\n\
-    ldrh r0, [r0]\n\
-    cmp r0, 0\n\
-    beq _08041610\n\
-    adds r4, r1, 0\n\
-    adds r4, 0xA0\n\
-    adds r4, r5, r4\n\
-    mov r0, r8\n\
-    adds r1, r4, 0\n\
-    bl GiveMailToMon2\n\
-    adds r0, r4, 0\n\
-    bl sub_80417F4\n\
-_08041610:\n\
-    bl party_compaction\n\
-    adds r0, r6, 0\n\
-    bl ZeroBoxMonData\n\
-    movs r2, 0x88\n\
-    lsls r2, 1\n\
-    adds r0, r5, r2\n\
-    adds r0, r7\n\
-    movs r1, 0\n\
-    str r1, [r0]\n\
-    adds r0, r5, 0\n\
-    bl sub_80414C0\n\
-    bl CalculatePlayerPartyCount\n\
-    mov r0, r9\n\
-    add sp, 0x68\n\
-    pop {r3,r4}\n\
-    mov r8, r3\n\
-    mov r9, r4\n\
-    pop {r4-r7}\n\
-    pop {r1}\n\
-    bx r1\n\
-    .align 2, 0\n\
-_08041640: .4byte gStringVar1\n\
-_08041644: .4byte gPlayerParty\n\
-    .syntax divided");
+u16 sub_8041570(struct DayCareData * daycare_data, u8 a2)
+{
+    u16 species;
+    u32 experience;
+    struct Pokemon pokemon;
+
+    GetBoxMonNick(&daycare_data->mons[a2], gStringVar1);
+    species = GetBoxMonData(&daycare_data->mons[a2], MON_DATA_SPECIES);
+    sub_803B4B4(&daycare_data->mons[a2], &pokemon);
+    if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
+    {
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.steps[a2];
+        SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
+        sub_804151C(&pokemon);
+    }
+    gPlayerParty[PARTY_SIZE - 1] = pokemon;
+    if (daycare_data->mail.data[a2].mail.itemId)
+    {
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[a2].mail);
+        sub_80417F4(&daycare_data->mail.data[a2].mail);
+    }
+    party_compaction();
+    ZeroBoxMonData(&daycare_data->mons[a2]);
+    daycare_data->mail.extra.steps[a2] = 0;
+    sub_80414C0(daycare_data);
+    CalculatePlayerPartyCount();
+    return species;
 }
 
 extern u8 gSpecialVar_0x8004;
diff --git a/src/pokemon_1.c b/src/pokemon_1.c
index c65bfa185..5cfd2c794 100644
--- a/src/pokemon_1.c
+++ b/src/pokemon_1.c
@@ -467,10 +467,10 @@ void CalculateMonStats(struct Pokemon *mon)
     SetMonData(mon, MON_DATA_HP, (u8 *)&currentHP);
 }
 
-void sub_803B4B4(struct Pokemon *src, struct Pokemon *dest)
+void sub_803B4B4(const struct BoxPokemon *src, struct Pokemon *dest)
 {
     u32 value = 0;
-    memcpy(&dest->box, &src->box, sizeof(struct BoxPokemon));
+    dest->box = *src;
     SetMonData(dest, MON_DATA_STATUS, (u8 *)&value);
     SetMonData(dest, MON_DATA_HP, (u8 *)&value);
     SetMonData(dest, MON_DATA_MAX_HP, (u8 *)&value);
-- 
cgit v1.2.3


From 710346afa3c90682e123ebd981fb8c8ffb30784f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 22:57:04 -0400
Subject: sub_80416A0

---
 src/daycare.c | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 2f30c1479..f067ec8ec 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "daycare.h"
 #include "pokemon.h"
+#include "event_data.h"
 #include "species.h"
 #include "items.h"
 #include "text.h"
@@ -144,37 +145,35 @@ void sub_804151C(struct Pokemon * mon)
     CalculateMonStats(mon);
 }
 
-u16 sub_8041570(struct DayCareData * daycare_data, u8 a2)
+u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
 {
     u16 species;
     u32 experience;
     struct Pokemon pokemon;
 
-    GetBoxMonNick(&daycare_data->mons[a2], gStringVar1);
-    species = GetBoxMonData(&daycare_data->mons[a2], MON_DATA_SPECIES);
-    sub_803B4B4(&daycare_data->mons[a2], &pokemon);
+    GetBoxMonNick(&daycare_data->mons[slot], gStringVar1);
+    species = GetBoxMonData(&daycare_data->mons[slot], MON_DATA_SPECIES);
+    sub_803B4B4(&daycare_data->mons[slot], &pokemon);
     if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.steps[a2];
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
         sub_804151C(&pokemon);
     }
     gPlayerParty[PARTY_SIZE - 1] = pokemon;
-    if (daycare_data->mail.data[a2].mail.itemId)
+    if (daycare_data->mail.data[slot].mail.itemId)
     {
-        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[a2].mail);
-        sub_80417F4(&daycare_data->mail.data[a2].mail);
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[slot].mail);
+        sub_80417F4(&daycare_data->mail.data[slot].mail);
     }
     party_compaction();
-    ZeroBoxMonData(&daycare_data->mons[a2]);
-    daycare_data->mail.extra.steps[a2] = 0;
+    ZeroBoxMonData(&daycare_data->mons[slot]);
+    daycare_data->mail.extra.steps[slot] = 0;
     sub_80414C0(daycare_data);
     CalculatePlayerPartyCount();
     return species;
 }
 
-extern u8 gSpecialVar_0x8004;
-
 u16 sub_8041648()
 {
     return sub_8041570(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
@@ -186,3 +185,13 @@ u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){
     SetBoxMonData(&temp, MON_DATA_EXP, (u8 *) &new_exp);
     return GetLevelFromBoxMonExp(&temp);
 }
+
+u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
+{
+    u8 levelBefore;
+    u8 levelAfter;
+
+    levelBefore = GetLevelFromBoxMonExp(&daycareData->mons[slot]);
+    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.steps[slot]);
+    return levelAfter - levelBefore;
+}
-- 
cgit v1.2.3


From 93809c58cfb8279f4faa086e8c5f8fd65a368fc3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 23:01:28 -0400
Subject: sub_80416E8

---
 src/daycare.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index f067ec8ec..bb503b041 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -195,3 +195,11 @@ u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.steps[slot]);
     return levelAfter - levelBefore;
 }
+
+u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
+{
+    u8 levelDelta = sub_80416A0(dayCareData, slot);
+    GetBoxMonNick(&dayCareData->mons[slot], gStringVar1);
+    ConvertIntToDecimalStringN(gStringVar2, levelDelta, STR_CONV_MODE_LEFT_ALIGN, 2);
+    return levelDelta;
+}
-- 
cgit v1.2.3


From b700afb37edcd53b2190fdbae05a4236a60ff46d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 23:08:06 -0400
Subject: sub_8041728

---
 src/daycare.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index bb503b041..77df3de23 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -203,3 +203,14 @@ u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
     ConvertIntToDecimalStringN(gStringVar2, levelDelta, STR_CONV_MODE_LEFT_ALIGN, 2);
     return levelDelta;
 }
+
+int sub_8041728(struct DayCareData *dayCareData, u8 slot)
+{
+    int cost;
+
+    u8 levelDelta = sub_80416A0(dayCareData, slot);
+    GetBoxMonNick(&dayCareData->mons[slot], gStringVar1);
+    cost = 100 + 100 * levelDelta;
+    ConvertIntToDecimalStringN(gStringVar2, cost, STR_CONV_MODE_LEFT_ALIGN, 5);
+    return cost;
+}
-- 
cgit v1.2.3


From c3f70c933c0a32d70ce1a471cc66833b88ce03f1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 23:09:53 -0400
Subject: sub_8041770

---
 src/daycare.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 77df3de23..2a66548cf 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -204,9 +204,9 @@ u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
     return levelDelta;
 }
 
-int sub_8041728(struct DayCareData *dayCareData, u8 slot)
+u16 sub_8041728(struct DayCareData *dayCareData, u8 slot)
 {
-    int cost;
+    u16 cost;
 
     u8 levelDelta = sub_80416A0(dayCareData, slot);
     GetBoxMonNick(&dayCareData->mons[slot], gStringVar1);
@@ -214,3 +214,8 @@ int sub_8041728(struct DayCareData *dayCareData, u8 slot)
     ConvertIntToDecimalStringN(gStringVar2, cost, STR_CONV_MODE_LEFT_ALIGN, 5);
     return cost;
 }
+
+void sub_8041770(void)
+{
+    gSpecialVar_0x8005 = sub_8041728(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
+}
-- 
cgit v1.2.3


From 99d478f1d392729a421c4d50ad074f49501857e3 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 23:18:46 -0400
Subject: Through sub_80417B8

---
 src/daycare.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 2a66548cf..fc5e9a0d0 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -219,3 +219,16 @@ void sub_8041770(void)
 {
     gSpecialVar_0x8005 = sub_8041728(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
 }
+
+void sub_8041790(u16 i)
+{
+    gSaveBlock1.daycareData.mail.extra.steps[0] += i;
+    gSaveBlock1.daycareData.mail.extra.steps[1] += i;
+}
+
+u8 sub_80417B8(void)
+{
+    if (GetBoxMonData(&gSaveBlock1.daycareData.mons[gSpecialVar_0x8004], MON_DATA_SPECIES) != 0)
+        return sub_80416E8(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
+    return 0;
+}
-- 
cgit v1.2.3


From d3b3cd6568afe59521c5fbc8ff878d3cb06134c9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 29 Aug 2017 23:38:07 -0400
Subject: sub_80417F4

---
 src/daycare.c | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index fc5e9a0d0..d7ded8721 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -104,7 +104,7 @@ void Daycare_SendPokemon_Special()
     Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, &gSaveBlock1.daycareData);
 }
 
-void sub_80417F4(struct MailStruct *);
+void sub_80417F4(struct DayCareMail *);
 
 void sub_80414C0(struct DayCareData * daycare_data)
 {
@@ -115,7 +115,7 @@ void sub_80414C0(struct DayCareData * daycare_data)
         daycare_data->mail.data[0] = daycare_data->mail.data[1];
         daycare_data->mail.extra.steps[0] = daycare_data->mail.extra.steps[1];
         daycare_data->mail.extra.steps[1] = 0;
-        sub_80417F4(&daycare_data->mail.data[1].mail);
+        sub_80417F4(&daycare_data->mail.data[1]);
     }
 }
 
@@ -164,7 +164,7 @@ u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     if (daycare_data->mail.data[slot].mail.itemId)
     {
         GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[slot].mail);
-        sub_80417F4(&daycare_data->mail.data[slot].mail);
+        sub_80417F4(&daycare_data->mail.data[slot]);
     }
     party_compaction();
     ZeroBoxMonData(&daycare_data->mons[slot]);
@@ -232,3 +232,19 @@ u8 sub_80417B8(void)
         return sub_80416E8(&gSaveBlock1.daycareData, gSpecialVar_0x8004);
     return 0;
 }
+
+void sub_80417F4(struct DayCareMail *mail)
+{
+    u8 zero;
+    u8 *names;
+    u8 *names2;
+    int i;
+    zero = 0;
+    for (i = 7, names = mail->names + 7; i >= 0; i --)
+        *names-- = zero;
+    names2 = mail->names + 8;
+    zero = 0;
+    names = mail->names + 18;
+    do *names-- = zero; while ((int)names >= (int)names2);
+    ClearMailStruct(&mail->mail);
+}
-- 
cgit v1.2.3


From 885aa7d1b875de62569319f28a5d2836d5c366e6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 30 Aug 2017 08:15:03 -0400
Subject: unref_sub_8041824

---
 src/daycare.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index d7ded8721..3f65c5bea 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -248,3 +248,16 @@ void sub_80417F4(struct DayCareMail *mail)
     do *names-- = zero; while ((int)names >= (int)names2);
     ClearMailStruct(&mail->mail);
 }
+
+void unref_sub_8041824(struct DayCareData *dayCareData)
+{
+    u8 slot;
+    for (slot = 0; slot < ARRAY_COUNT(dayCareData->mons); slot ++)
+    {
+        ZeroBoxMonData(&dayCareData->mons[slot]);
+        dayCareData->mail.extra.steps[slot] = 0;
+        sub_80417F4(&dayCareData->mail.data[slot]);
+    }
+    dayCareData->unk_118 = 0;
+    dayCareData->unk_11a = 0;
+}
-- 
cgit v1.2.3


From 448df1097658cab72dca07b48d205acb0c7e7164 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 30 Aug 2017 08:43:32 -0400
Subject: sub_8041870 (find pre-evo)

---
 src/daycare.c | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 3f65c5bea..dc1300182 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -261,3 +261,30 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
     dayCareData->unk_118 = 0;
     dayCareData->unk_11a = 0;
 }
+
+u16 sub_8041870(u16 species)
+{
+    int i, j, k;
+    bool8 found;
+    for (i = 0; i < 5; i ++)
+    {
+        found = FALSE;
+        for (j = 1; j < NUM_SPECIES; j ++)
+        {
+            for (k = 0; k < 5; k ++)
+            {
+                if (gEvolutionTable[j].evolutions[k].targetSpecies == species)
+                {
+                    species = j;
+                    found = TRUE;
+                    break;
+                }
+            }
+            if (found)
+                break;
+        }
+        if (j == 412)
+            break;
+    }
+    return species;
+}
-- 
cgit v1.2.3


From 2286c4306f67a091e48eac724536e7853117f0e0 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 09:20:21 -0400
Subject: Fix building

---
 src/mori_debug_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index abb09d889..df3446d3e 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.daycareData.extra.unk_2 = -3;
+    gSaveBlock1.daycareData.unk_11a = -3;
     CloseMenu();
     return 1;
 }
-- 
cgit v1.2.3


From b9cf26cd89505d5340343adeb41312012714fd0a Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 09:24:57 -0400
Subject: sub_80418F0

---
 src/daycare.c | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index dc1300182..3fc1ecd99 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -9,6 +9,7 @@
 #include "mail_data.h"
 #include "name_string_util.h"
 #include "pokemon_storage_system.h"
+#include "rng.h"
 
 extern u8 gLastFieldPokeMenuOpened;
 
@@ -288,3 +289,9 @@ u16 sub_8041870(u16 species)
     }
     return species;
 }
+
+void sub_80418F0(struct DayCareData *dayCareData)
+{
+    dayCareData->unk_118 = (Random() % 0xfffe) + 1;
+    FlagSet(0x86);
+}
-- 
cgit v1.2.3


From 7755869cd2b521cb0a608f5f71c8a272e81cb214 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 09:43:48 -0400
Subject: Convert egg moves and daycare strings/pointers to C objects

---
 src/daycare.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 3fc1ecd99..8096904b0 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -10,6 +10,18 @@
 #include "name_string_util.h"
 #include "pokemon_storage_system.h"
 #include "rng.h"
+#include "moves.h"
+#include "strings2.h"
+#include "data/pokemon/egg_moves.h"
+
+const u8 *const gUnknown_08209AC4[] = {
+    DaycareText_GetAlongVeryWell,
+    DaycareText_GetAlong,
+    DaycareText_DontLikeOther,
+    DaycareText_PlayOther
+};
+
+const u8 gUnknown_08209AD4[] = _("タマゴ");
 
 extern u8 gLastFieldPokeMenuOpened;
 
-- 
cgit v1.2.3


From c8ceacec344b229a56ec44bf1835345a7a7f5f54 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 09:52:16 -0400
Subject: Through sub_8041960

---
 src/daycare.c | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 8096904b0..922d1fd45 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -307,3 +307,32 @@ void sub_80418F0(struct DayCareData *dayCareData)
     dayCareData->unk_118 = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
+
+void sub_804191C(struct DayCareData *dayCareData)
+{
+    dayCareData->unk_118 = Random() | 0x8000;
+    FlagSet(0x86);
+}
+
+void sub_8041940(void)
+{
+    sub_80418F0(&gSaveBlock1.daycareData);
+}
+
+void sub_8041950(void)
+{
+    sub_804191C(&gSaveBlock1.daycareData);
+}
+
+void sub_8041960(u8 *data, u8 idx)
+{
+    int i, j;
+    u8 temp[6];
+    data[idx] = 0xff;
+    for (i = 0; i < 6; i ++)
+        temp[i] = data[i];
+    j = 0;
+    for (i = 0; i < 6; i ++)
+        if (temp[i] != 0xff)
+            data[j++] = temp[i];
+}
-- 
cgit v1.2.3


From d5840cf101fb6fd3720c525003b891d50611b9b0 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 10:06:55 -0400
Subject: InheritIVs

---
 src/daycare.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 922d1fd45..641b8d68d 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -336,3 +336,51 @@ void sub_8041960(u8 *data, u8 idx)
         if (temp[i] != 0xff)
             data[j++] = temp[i];
 }
+
+void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
+{
+    u8 i;
+    u8 selectedIvs[3];
+    u8 allIvs[6];
+    u8 whichParent[3];
+    u8 iv;
+    for (i = 0; i < 6; i ++)
+        allIvs[i] = i;
+    for (i = 0; i < 3; i ++)
+    {
+        selectedIvs[i] = allIvs[Random() % (6 - i)];
+        sub_8041960(allIvs, selectedIvs[i]);
+    }
+    for (i = 0; i < 3; i ++)
+        whichParent[i] = Random() % 2;
+    for (i = 0; i < 3; i ++)
+    {
+        switch (selectedIvs[i])
+        {
+            case 0:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_HP_IV);
+                SetMonData(egg, MON_DATA_HP_IV, &iv);
+                break;
+            case 1:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_ATK_IV);
+                SetMonData(egg, MON_DATA_ATK_IV, &iv);
+                break;
+            case 2:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_DEF_IV);
+                SetMonData(egg, MON_DATA_DEF_IV, &iv);
+                break;
+            case 3:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_SPD_IV);
+                SetMonData(egg, MON_DATA_SPD_IV, &iv);
+                break;
+            case 4:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_SPATK_IV);
+                SetMonData(egg, MON_DATA_SPATK_IV, &iv);
+                break;
+            case 5:
+                iv = GetBoxMonData(&dayCareData->mons[whichParent[i]], MON_DATA_SPDEF_IV);
+                SetMonData(egg, MON_DATA_SPDEF_IV, &iv);
+                break;
+        }
+    }
+}
-- 
cgit v1.2.3


From 562454400bf37a5a9bd945969ef43d8c416bef12 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 12:39:29 -0400
Subject: Nearly-matching pokemon_get_eggmoves

---
 src/daycare.c | 114 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 113 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 641b8d68d..129fbeb6d 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -324,7 +324,7 @@ void sub_8041950(void)
     sub_804191C(&gSaveBlock1.daycareData);
 }
 
-void sub_8041960(u8 *data, u8 idx)
+static void sub_8041960(u8 *data, u8 idx)
 {
     int i, j;
     u8 temp[6];
@@ -384,3 +384,115 @@ void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
         }
     }
 }
+
+#ifdef NONMATCHING
+u8 pokemon_get_eggmoves(struct Pokemon *egg, u16 buffer[10])
+{
+    u16 i, j;
+    u16 nEggMoves = 0;
+    u16 offset = 0;
+    u16 species = GetMonData(egg, MON_DATA_SPECIES);
+    for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i ++)
+        if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
+        {
+            offset = i + 1;
+            break;
+        }
+    // Register differences incurred here due to cryptic duplication of gEggMoves pointer
+    for (j = 0; j < 10 && gEggMoves[offset + j] <= EGG_MOVES_SPECIES_OFFSET; j ++)
+    {
+        buffer[j] = gEggMoves[offset + j];
+        nEggMoves ++;
+    }
+    return nEggMoves;
+}
+#else
+__attribute__((naked))
+u8 pokemon_get_eggmoves(struct Pokemon *egg, u16 buffer[10])
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r8\n"
+                    "\tpush {r7}\n"
+                    "\tmov r8, r1\n"
+                    "\tmovs r6, 0\n"
+                    "\tmovs r4, 0\n"
+                    "\tmovs r1, 0xB\n"
+                    "\tbl GetMonData\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r3, r0, 16\n"
+                    "\tmovs r2, 0\n"
+                    "\tldr r5, _08041B44 @ =gEggMoves\n"
+                    "\tldrh r1, [r5]\n"
+                    "\tldr r7, _08041B48 @ =0x00004e20\n"
+                    "\tadds r0, r3, r7\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _08041B4C\n"
+                    "\tmovs r4, 0x1\n"
+                    "\tb _08041B6E\n"
+                    "\t.align 2, 0\n"
+                    "_08041B44: .4byte gEggMoves\n"
+                    "_08041B48: .4byte 0x00004e20\n"
+                    "_08041B4C:\n"
+                    "\tadds r0, r2, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r2, r0, 16\n"
+                    "\tldr r0, _08041BB8 @ =0x00000471\n"
+                    "\tldr r5, _08041BBC @ =gEggMoves\n"
+                    "\tcmp r2, r0\n"
+                    "\tbhi _08041B6E\n"
+                    "\tlsls r0, r2, 1\n"
+                    "\tadds r0, r5\n"
+                    "\tldrh r1, [r0]\n"
+                    "\tldr r7, _08041BC0 @ =0x00004e20\n"
+                    "\tadds r0, r3, r7\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _08041B4C\n"
+                    "\tadds r0, r2, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r4, r0, 16\n"
+                    "_08041B6E:\n"
+                    "\tmovs r2, 0\n"
+                    "\tlsls r0, r4, 1\n"
+                    "\tadds r0, r5\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tldr r1, _08041BC0 @ =0x00004e20\n"
+                    "\tcmp r0, r1\n"
+                    "\tbhi _08041BAA\n"
+                    "\tadds r7, r5, 0\n"
+                    "\tadds r3, r1, 0\n"
+                    "_08041B80:\n"
+                    "\tlsls r1, r2, 1\n"
+                    "\tadd r1, r8\n"
+                    "\tadds r0, r4, r2\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r0, r7\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tadds r0, r2, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r2, r0, 16\n"
+                    "\tcmp r2, 0x9\n"
+                    "\tbhi _08041BAA\n"
+                    "\tadds r0, r4, r2\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r0, r5\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r0, r3\n"
+                    "\tbls _08041B80\n"
+                    "_08041BAA:\n"
+                    "\tlsls r0, r6, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tpop {r3}\n"
+                    "\tmov r8, r3\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1\n"
+                    "\t.align 2, 0\n"
+                    "_08041BB8: .4byte 0x00000471\n"
+                    "_08041BBC: .4byte gEggMoves\n"
+                    "_08041BC0: .4byte 0x00004e20");
+}
+#endif
-- 
cgit v1.2.3


From 6442f46338f5efd04b76a3790a06ee90101f5441 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 15:19:26 -0400
Subject: Nonmatching build_child_moveset

---
 src/daycare.c | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 91 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 129fbeb6d..a4dd438bb 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -13,6 +13,7 @@
 #include "moves.h"
 #include "strings2.h"
 #include "data/pokemon/egg_moves.h"
+#include "party_menu.h"
 
 const u8 *const gUnknown_08209AC4[] = {
     DaycareText_GetAlongVeryWell,
@@ -496,3 +497,93 @@ u8 pokemon_get_eggmoves(struct Pokemon *egg, u16 buffer[10])
                     "_08041BC0: .4byte 0x00004e20");
 }
 #endif
+
+extern u16 gUnknown_03000470[50];
+extern u16 gUnknown_030004D8[4];
+extern u16 gUnknown_030004E0[4];
+extern u16 gUnknown_030004E8[10];
+extern u16 gUnknown_03000500[4];
+
+void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
+{
+    u16 numSharedParentMoves;
+    u8 numLevelUpMoves;
+    u8 numEggMoves;
+    u16 i, j;
+
+    numSharedParentMoves = 0;
+    for (i = 0; i < 4; i ++)
+    {
+        gUnknown_03000500[i] = 0;
+        gUnknown_030004D8[i] = 0;
+        gUnknown_030004E0[i] = 0;
+    }
+    for (i = 0; i < 10; i ++)
+        gUnknown_030004E8[i] = 0;
+    for (i = 0; i < 50; i ++)
+        gUnknown_03000470[i] = 0;
+
+    numLevelUpMoves = GetLevelUpMovesBySpecies(GetMonData(egg, MON_DATA_SPECIES), gUnknown_03000470);
+    for (i = 0; i < 4; i ++)
+    {
+        gUnknown_030004D8[i] = GetBoxMonData(dad, MON_DATA_MOVE1 + i);
+        gUnknown_03000500[i] = GetBoxMonData(mom, MON_DATA_MOVE1 + i);
+    }
+    numEggMoves = pokemon_get_eggmoves(egg, gUnknown_030004E8);
+
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_030004D8[i] != MOVE_NONE)
+        {
+            for (j = 0; j < numEggMoves; j ++)
+            {
+                if (gUnknown_030004D8[i] == gUnknown_030004E8[j])
+                {
+                    if (GiveMoveToMon(egg, gUnknown_030004D8[i]) == 0xffff)
+                        DeleteFirstMoveAndGiveMoveToMon(egg, gUnknown_030004D8[i]);
+                    break;
+                }
+            }
+        }
+        else
+            break;
+    }
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_030004D8[i] != MOVE_NONE)
+        {
+            for (j = 0; j < 50 + 8; j ++)
+            {
+                if (gUnknown_030004D8[i] == ItemIdToBattleMoveId(ITEM_TM01 + j) && CanMonLearnTMHM(egg, j))
+                {
+                    if (GiveMoveToMon(egg, gUnknown_030004D8[i]) == 0xffff)
+                        DeleteFirstMoveAndGiveMoveToMon(egg, gUnknown_030004D8[i]);
+                }
+            }
+        }
+    }
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_030004D8[i] == MOVE_NONE)
+            break;
+        for (j = 0; j < 4; j ++)
+        {
+            if (gUnknown_030004D8[i] == gUnknown_03000500[j] && gUnknown_030004D8[i] != MOVE_NONE)
+                gUnknown_030004E0[numSharedParentMoves++] = gUnknown_030004D8[i];
+        }
+    }
+    for (i = 0; i < 4; i ++)
+    {
+        if (gUnknown_030004E0[i] == MOVE_NONE)
+            break;
+        for (j = 0; j < numLevelUpMoves; j ++)
+        {
+            if (gUnknown_03000470[j] != MOVE_NONE && gUnknown_030004E0[i] == gUnknown_03000470[j])
+            {
+                if (GiveMoveToMon(egg, gUnknown_030004E0[i]) == 0xffff)
+                    DeleteFirstMoveAndGiveMoveToMon(egg, gUnknown_030004E0[i]);
+                break;
+            }
+        }
+    }
+}
-- 
cgit v1.2.3


From 433823c4e330032b68a379784c98efaa3a94f15c Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 15:32:14 -0400
Subject: Fix pokemon_get_eggmoves

---
 src/daycare.c | 463 +++++++++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 361 insertions(+), 102 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index a4dd438bb..38bfba85e 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -386,117 +386,35 @@ void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
     }
 }
 
-#ifdef NONMATCHING
-u8 pokemon_get_eggmoves(struct Pokemon *egg, u16 buffer[10])
+u8 pokemon_get_eggmoves(struct Pokemon *pokemon, u16 *eggMoves)
 {
-    u16 i, j;
-    u16 nEggMoves = 0;
-    u16 offset = 0;
-    u16 species = GetMonData(egg, MON_DATA_SPECIES);
+    u16 eggMoveIdx;
+    u16 numMovesFound;
+    u16 species;
+    u16 i;
+
+    numMovesFound = 0;
+    eggMoveIdx = 0;
+    species = GetMonData(pokemon, MON_DATA_SPECIES);
     for (i = 0; i < ARRAY_COUNT(gEggMoves) - 1; i ++)
+    {
         if (gEggMoves[i] == species + EGG_MOVES_SPECIES_OFFSET)
         {
-            offset = i + 1;
+            eggMoveIdx = i + 1;
             break;
         }
-    // Register differences incurred here due to cryptic duplication of gEggMoves pointer
-    for (j = 0; j < 10 && gEggMoves[offset + j] <= EGG_MOVES_SPECIES_OFFSET; j ++)
+    }
+    for (i = 0; i < 10; i ++)
     {
-        buffer[j] = gEggMoves[offset + j];
-        nEggMoves ++;
+        if (gEggMoves[eggMoveIdx + i] > EGG_MOVES_SPECIES_OFFSET)
+        {
+            break;
+        }
+        eggMoves[i] = gEggMoves[eggMoveIdx + i];
+        numMovesFound++;
     }
-    return nEggMoves;
-}
-#else
-__attribute__((naked))
-u8 pokemon_get_eggmoves(struct Pokemon *egg, u16 buffer[10])
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                    "\tmov r7, r8\n"
-                    "\tpush {r7}\n"
-                    "\tmov r8, r1\n"
-                    "\tmovs r6, 0\n"
-                    "\tmovs r4, 0\n"
-                    "\tmovs r1, 0xB\n"
-                    "\tbl GetMonData\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r3, r0, 16\n"
-                    "\tmovs r2, 0\n"
-                    "\tldr r5, _08041B44 @ =gEggMoves\n"
-                    "\tldrh r1, [r5]\n"
-                    "\tldr r7, _08041B48 @ =0x00004e20\n"
-                    "\tadds r0, r3, r7\n"
-                    "\tcmp r1, r0\n"
-                    "\tbne _08041B4C\n"
-                    "\tmovs r4, 0x1\n"
-                    "\tb _08041B6E\n"
-                    "\t.align 2, 0\n"
-                    "_08041B44: .4byte gEggMoves\n"
-                    "_08041B48: .4byte 0x00004e20\n"
-                    "_08041B4C:\n"
-                    "\tadds r0, r2, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r2, r0, 16\n"
-                    "\tldr r0, _08041BB8 @ =0x00000471\n"
-                    "\tldr r5, _08041BBC @ =gEggMoves\n"
-                    "\tcmp r2, r0\n"
-                    "\tbhi _08041B6E\n"
-                    "\tlsls r0, r2, 1\n"
-                    "\tadds r0, r5\n"
-                    "\tldrh r1, [r0]\n"
-                    "\tldr r7, _08041BC0 @ =0x00004e20\n"
-                    "\tadds r0, r3, r7\n"
-                    "\tcmp r1, r0\n"
-                    "\tbne _08041B4C\n"
-                    "\tadds r0, r2, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r4, r0, 16\n"
-                    "_08041B6E:\n"
-                    "\tmovs r2, 0\n"
-                    "\tlsls r0, r4, 1\n"
-                    "\tadds r0, r5\n"
-                    "\tldrh r0, [r0]\n"
-                    "\tldr r1, _08041BC0 @ =0x00004e20\n"
-                    "\tcmp r0, r1\n"
-                    "\tbhi _08041BAA\n"
-                    "\tadds r7, r5, 0\n"
-                    "\tadds r3, r1, 0\n"
-                    "_08041B80:\n"
-                    "\tlsls r1, r2, 1\n"
-                    "\tadd r1, r8\n"
-                    "\tadds r0, r4, r2\n"
-                    "\tlsls r0, 1\n"
-                    "\tadds r0, r7\n"
-                    "\tldrh r0, [r0]\n"
-                    "\tstrh r0, [r1]\n"
-                    "\tadds r0, r6, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r6, r0, 16\n"
-                    "\tadds r0, r2, 0x1\n"
-                    "\tlsls r0, 16\n"
-                    "\tlsrs r2, r0, 16\n"
-                    "\tcmp r2, 0x9\n"
-                    "\tbhi _08041BAA\n"
-                    "\tadds r0, r4, r2\n"
-                    "\tlsls r0, 1\n"
-                    "\tadds r0, r5\n"
-                    "\tldrh r0, [r0]\n"
-                    "\tcmp r0, r3\n"
-                    "\tbls _08041B80\n"
-                    "_08041BAA:\n"
-                    "\tlsls r0, r6, 24\n"
-                    "\tlsrs r0, 24\n"
-                    "\tpop {r3}\n"
-                    "\tmov r8, r3\n"
-                    "\tpop {r4-r7}\n"
-                    "\tpop {r1}\n"
-                    "\tbx r1\n"
-                    "\t.align 2, 0\n"
-                    "_08041BB8: .4byte 0x00000471\n"
-                    "_08041BBC: .4byte gEggMoves\n"
-                    "_08041BC0: .4byte 0x00004e20");
+    return numMovesFound;
 }
-#endif
 
 extern u16 gUnknown_03000470[50];
 extern u16 gUnknown_030004D8[4];
@@ -504,6 +422,7 @@ extern u16 gUnknown_030004E0[4];
 extern u16 gUnknown_030004E8[10];
 extern u16 gUnknown_03000500[4];
 
+#ifdef NONMATCHING
 void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
 {
     u16 numSharedParentMoves;
@@ -587,3 +506,343 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
         }
     }
 }
+#else
+__attribute__((naked))
+void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
+{
+    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, 0xC\n"
+                    "\tadds r7, r0, 0\n"
+                    "\tmov r10, r1\n"
+                    "\tmov r9, r2\n"
+                    "\tmovs r0, 0\n"
+                    "\tstr r0, [sp]\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r5, _08041CC8 @ =gUnknown_03000500\n"
+                    "\tmovs r2, 0\n"
+                    "\tldr r4, _08041CCC @ =gUnknown_030004D8\n"
+                    "\tldr r3, _08041CD0 @ =gUnknown_030004E0\n"
+                    "_08041BE4:\n"
+                    "\tlsls r1, r6, 1\n"
+                    "\tadds r0, r1, r5\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tadds r0, r1, r4\n"
+                    "\tstrh r2, [r0]\n"
+                    "\tadds r1, r3\n"
+                    "\tstrh r2, [r1]\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbls _08041BE4\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r2, _08041CD4 @ =gUnknown_030004E8\n"
+                    "\tmovs r1, 0\n"
+                    "_08041C02:\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tadds r0, r2\n"
+                    "\tstrh r1, [r0]\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x9\n"
+                    "\tbls _08041C02\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r2, _08041CD8 @ =gUnknown_03000470\n"
+                    "\tmovs r1, 0\n"
+                    "_08041C18:\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tadds r0, r2\n"
+                    "\tstrh r1, [r0]\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x31\n"
+                    "\tbls _08041C18\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tmovs r1, 0xB\n"
+                    "\tbl GetMonData\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tldr r1, _08041CD8 @ =gUnknown_03000470\n"
+                    "\tbl GetLevelUpMovesBySpecies\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tstr r0, [sp, 0x4]\n"
+                    "\tmovs r6, 0\n"
+                    "\tldr r1, _08041CCC @ =gUnknown_030004D8\n"
+                    "\tmov r8, r1\n"
+                    "_08041C46:\n"
+                    "\tadds r5, r6, 0\n"
+                    "\tadds r5, 0xD\n"
+                    "\tmov r0, r10\n"
+                    "\tadds r1, r5, 0\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tlsls r4, r6, 1\n"
+                    "\tmov r2, r8\n"
+                    "\tadds r1, r4, r2\n"
+                    "\tstrh r0, [r1]\n"
+                    "\tmov r0, r9\n"
+                    "\tadds r1, r5, 0\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tldr r1, _08041CC8 @ =gUnknown_03000500\n"
+                    "\tadds r4, r1\n"
+                    "\tstrh r0, [r4]\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbls _08041C46\n"
+                    "\tldr r1, _08041CD4 @ =gUnknown_030004E8\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl pokemon_get_eggmoves\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tmov r8, r0\n"
+                    "\tmovs r6, 0\n"
+                    "_08041C82:\n"
+                    "\tldr r0, _08041CCC @ =gUnknown_030004D8\n"
+                    "\tlsls r1, r6, 1\n"
+                    "\tadds r2, r1, r0\n"
+                    "\tldrh r1, [r2]\n"
+                    "\tmov r9, r0\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _08041CF8\n"
+                    "\tmovs r5, 0\n"
+                    "\tcmp r5, r8\n"
+                    "\tbcs _08041CEA\n"
+                    "\tadds r4, r2, 0\n"
+                    "\tldr r2, _08041CDC @ =0x0000ffff\n"
+                    "_08041C9A:\n"
+                    "\tldr r0, _08041CD4 @ =gUnknown_030004E8\n"
+                    "\tlsls r1, r5, 1\n"
+                    "\tadds r1, r0\n"
+                    "\tldrh r0, [r4]\n"
+                    "\tldrh r1, [r1]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbne _08041CE0\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tstr r2, [sp, 0x8]\n"
+                    "\tbl GiveMoveToMon\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tldr r2, [sp, 0x8]\n"
+                    "\tcmp r0, r2\n"
+                    "\tbne _08041CEA\n"
+                    "\tldrh r1, [r4]\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl DeleteFirstMoveAndGiveMoveToMon\n"
+                    "\tb _08041CEA\n"
+                    "\t.align 2, 0\n"
+                    "_08041CC8: .4byte gUnknown_03000500\n"
+                    "_08041CCC: .4byte gUnknown_030004D8\n"
+                    "_08041CD0: .4byte gUnknown_030004E0\n"
+                    "_08041CD4: .4byte gUnknown_030004E8\n"
+                    "_08041CD8: .4byte gUnknown_03000470\n"
+                    "_08041CDC: .4byte 0x0000ffff\n"
+                    "_08041CE0:\n"
+                    "\tadds r0, r5, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r5, r0, 16\n"
+                    "\tcmp r5, r8\n"
+                    "\tbcc _08041C9A\n"
+                    "_08041CEA:\n"
+                    "\tadds r0, r6, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tldr r3, _08041E14 @ =gUnknown_030004D8\n"
+                    "\tmov r9, r3\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbls _08041C82\n"
+                    "_08041CF8:\n"
+                    "\tmovs r6, 0\n"
+                    "_08041CFA:\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tmov r2, r9\n"
+                    "\tadds r1, r0, r2\n"
+                    "\tldrh r1, [r1]\n"
+                    "\tadds r2, r0, 0\n"
+                    "\tadds r6, 0x1\n"
+                    "\tmov r8, r6\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _08041D5C\n"
+                    "\tmovs r5, 0\n"
+                    "\tldr r0, _08041E14 @ =gUnknown_030004D8\n"
+                    "\tadds r4, r2, r0\n"
+                    "\tldr r6, _08041E18 @ =0x0000ffff\n"
+                    "\tmov r9, r0\n"
+                    "_08041D16:\n"
+                    "\tldr r3, _08041E1C @ =0x00000121\n"
+                    "\tadds r0, r5, r3\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tbl ItemIdToBattleMoveId\n"
+                    "\tldrh r1, [r4]\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _08041D52\n"
+                    "\tlsls r1, r5, 24\n"
+                    "\tlsrs r1, 24\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl CanMonLearnTMHM\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _08041D52\n"
+                    "\tldrh r1, [r4]\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl GiveMoveToMon\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tcmp r0, r6\n"
+                    "\tbne _08041D52\n"
+                    "\tldrh r1, [r4]\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl DeleteFirstMoveAndGiveMoveToMon\n"
+                    "_08041D52:\n"
+                    "\tadds r0, r5, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r5, r0, 16\n"
+                    "\tcmp r5, 0x39\n"
+                    "\tbls _08041D16\n"
+                    "_08041D5C:\n"
+                    "\tmov r1, r8\n"
+                    "\tlsls r0, r1, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbls _08041CFA\n"
+                    "\tmovs r6, 0\n"
+                    "\tmov r2, r9\n"
+                    "\tldrh r0, [r2]\n"
+                    "\tldr r3, _08041E20 @ =gUnknown_030004E0\n"
+                    "\tmov r10, r3\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _08041DC6\n"
+                    "\tmov r4, r9\n"
+                    "\tldr r0, _08041E24 @ =gUnknown_03000500\n"
+                    "\tmov r9, r0\n"
+                    "\tmov r12, r10\n"
+                    "_08041D7C:\n"
+                    "\tmovs r5, 0\n"
+                    "\tlsls r2, r6, 1\n"
+                    "\tadds r6, 0x1\n"
+                    "\tmov r8, r6\n"
+                    "\tadds r3, r2, r4\n"
+                    "_08041D86:\n"
+                    "\tlsls r0, r5, 1\n"
+                    "\tadd r0, r9\n"
+                    "\tldrh r2, [r3]\n"
+                    "\tadds r1, r2, 0\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r1, r0\n"
+                    "\tbne _08041DA8\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _08041DA8\n"
+                    "\tldr r1, [sp]\n"
+                    "\tadds r0, r1, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tstr r0, [sp]\n"
+                    "\tlsls r1, 1\n"
+                    "\tadd r1, r12\n"
+                    "\tstrh r2, [r1]\n"
+                    "_08041DA8:\n"
+                    "\tadds r0, r5, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r5, r0, 16\n"
+                    "\tcmp r5, 0x3\n"
+                    "\tbls _08041D86\n"
+                    "\tmov r1, r8\n"
+                    "\tlsls r0, r1, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbhi _08041DC6\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tadds r0, r4\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _08041D7C\n"
+                    "_08041DC6:\n"
+                    "\tmovs r6, 0\n"
+                    "\tmov r2, r10\n"
+                    "\tldrh r0, [r2]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _08041E50\n"
+                    "_08041DD0:\n"
+                    "\tmovs r5, 0\n"
+                    "\tadds r3, r6, 0x1\n"
+                    "\tmov r8, r3\n"
+                    "\tldr r0, [sp, 0x4]\n"
+                    "\tcmp r5, r0\n"
+                    "\tbcs _08041E38\n"
+                    "\tldr r2, _08041E18 @ =0x0000ffff\n"
+                    "_08041DDE:\n"
+                    "\tldr r1, _08041E28 @ =gUnknown_03000470\n"
+                    "\tlsls r0, r5, 1\n"
+                    "\tadds r0, r1\n"
+                    "\tldrh r1, [r0]\n"
+                    "\tcmp r1, 0\n"
+                    "\tbeq _08041E2C\n"
+                    "\tlsls r0, r6, 1\n"
+                    "\tmov r3, r10\n"
+                    "\tadds r4, r0, r3\n"
+                    "\tldrh r0, [r4]\n"
+                    "\tcmp r0, r1\n"
+                    "\tbne _08041E2C\n"
+                    "\tadds r1, r0, 0\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tstr r2, [sp, 0x8]\n"
+                    "\tbl GiveMoveToMon\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tldr r2, [sp, 0x8]\n"
+                    "\tcmp r0, r2\n"
+                    "\tbne _08041E38\n"
+                    "\tldrh r1, [r4]\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl DeleteFirstMoveAndGiveMoveToMon\n"
+                    "\tb _08041E38\n"
+                    "\t.align 2, 0\n"
+                    "_08041E14: .4byte gUnknown_030004D8\n"
+                    "_08041E18: .4byte 0x0000ffff\n"
+                    "_08041E1C: .4byte 0x00000121\n"
+                    "_08041E20: .4byte gUnknown_030004E0\n"
+                    "_08041E24: .4byte gUnknown_03000500\n"
+                    "_08041E28: .4byte gUnknown_03000470\n"
+                    "_08041E2C:\n"
+                    "\tadds r0, r5, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r5, r0, 16\n"
+                    "\tldr r0, [sp, 0x4]\n"
+                    "\tcmp r5, r0\n"
+                    "\tbcc _08041DDE\n"
+                    "_08041E38:\n"
+                    "\tmov r1, r8\n"
+                    "\tlsls r0, r1, 16\n"
+                    "\tlsrs r6, r0, 16\n"
+                    "\tcmp r6, 0x3\n"
+                    "\tbhi _08041E50\n"
+                    "\tldr r0, _08041E60 @ =gUnknown_030004E0\n"
+                    "\tlsls r1, r6, 1\n"
+                    "\tadds r1, r0\n"
+                    "\tldrh r1, [r1]\n"
+                    "\tmov r10, r0\n"
+                    "\tcmp r1, 0\n"
+                    "\tbne _08041DD0\n"
+                    "_08041E50:\n"
+                    "\tadd sp, 0xC\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r0}\n"
+                    "\tbx r0\n"
+                    "\t.align 2, 0\n"
+                    "_08041E60: .4byte gUnknown_030004E0");
+}
+#endif
-- 
cgit v1.2.3


From 97d9399be794f6a94137a1945af52ef1e26de4a7 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 16:02:46 -0400
Subject: Restore previously-decompiled functions; make static what should be
 static

---
 src/daycare.c | 219 +++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 180 insertions(+), 39 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 38bfba85e..1faaea4c6 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -14,6 +14,12 @@
 #include "strings2.h"
 #include "data/pokemon/egg_moves.h"
 #include "party_menu.h"
+#include "field_effect.h"
+
+extern u16 word_2024E82;
+
+static void sub_80417F4(struct DayCareMail *);
+static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
 
 const u8 *const gUnknown_08209AC4[] = {
     DaycareText_GetAlongVeryWell,
@@ -24,8 +30,6 @@ const u8 *const gUnknown_08209AC4[] = {
 
 const u8 gUnknown_08209AD4[] = _("タマゴ");
 
-extern u8 gLastFieldPokeMenuOpened;
-
 u8 *GetMonNick(struct Pokemon *mon, u8 *dest)
 {
     s8 nickname[POKEMON_NAME_LENGTH * 2];
@@ -54,7 +58,7 @@ u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
     return count;
 }
 
-void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * void_pointer)
+void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * daycareMailEtc)
 {
     u8 i;
     u8 specCount;
@@ -66,20 +70,20 @@ void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * void_p
             specCount ++;
             if (GetBoxMonData(&box_pokemon[i], MON_DATA_HELD_ITEM) == ITEM_NONE)
             {
-                void_pointer->extra.rc.unk74[i] = 0;
+                daycareMailEtc->extra.rc.unk74[i] = 0;
             } else
             {
-                void_pointer->extra.rc.unk74[i] = 1;
+                daycareMailEtc->extra.rc.unk74[i] = 1;
             }
         } else
         {
-            void_pointer->extra.rc.unk74[i] = 1;
+            daycareMailEtc->extra.rc.unk74[i] = 1;
         }
     }
-    void_pointer->extra.rc.unk70 = specCount;
+    daycareMailEtc->extra.rc.unk70 = specCount;
 }
 
-s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
+static s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
 {
     u8 i;
 
@@ -90,7 +94,8 @@ s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
     return -1;
 }
 
-void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * daycare_data){ // unfinished
+static void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * daycare_data)
+{
     s8 empty_slot;
     u8 mail;
     u8 *names;
@@ -118,9 +123,7 @@ void Daycare_SendPokemon_Special()
     Daycare_SendPokemon(gPlayerParty + gLastFieldPokeMenuOpened, &gSaveBlock1.daycareData);
 }
 
-void sub_80417F4(struct DayCareMail *);
-
-void sub_80414C0(struct DayCareData * daycare_data)
+static void sub_80414C0(struct DayCareData * daycare_data)
 {
     if((GetBoxMonData(&daycare_data->mons[1], MON_DATA_SPECIES) != 0) && GetBoxMonData(&daycare_data->mons[0], MON_DATA_SPECIES) == 0)
     {
@@ -133,33 +136,32 @@ void sub_80414C0(struct DayCareData * daycare_data)
     }
 }
 
-u8 TryIncrementMonLevel(struct Pokemon *);
-extern u16 word_2024E82;
-
-void sub_804151C(struct Pokemon * mon)
+static void DayCare_LevelUpMoves(struct Pokemon * mon)
 {
     s32 i;
     u8 r6;
     u16 temp;
 
-    for(i = 0; i < 100; i++){
-        if(TryIncrementMonLevel(mon) == FALSE) goto end;
-
-        r6 = 1;
-        while((temp = sub_803B7C8(mon, r6)) != 0){
-            r6 = 0;
-            if(temp == 0xffff){
-                DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82);
+    for (i = 0; i < 100; i++)
+    {
+        if (TryIncrementMonLevel(mon))
+        {
+            r6 = 1;
+            while ((temp = sub_803B7C8(mon, r6)) != 0)
+            {
+                r6 = 0;
+                if (temp == 0xffff)
+                    DeleteFirstMoveAndGiveMoveToMon(mon, word_2024E82);
             }
         }
+        else
+            break;
     }
 
-    end:
-
     CalculateMonStats(mon);
 }
 
-u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
+static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
 {
     u16 species;
     u32 experience;
@@ -172,7 +174,7 @@ u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     {
         experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
-        sub_804151C(&pokemon);
+        DayCare_LevelUpMoves(&pokemon);
     }
     gPlayerParty[PARTY_SIZE - 1] = pokemon;
     if (daycare_data->mail.data[slot].mail.itemId)
@@ -200,7 +202,7 @@ u8 Daycare_GetLevelAfterSteps(struct BoxPokemon * mon, u32 steps){
     return GetLevelFromBoxMonExp(&temp);
 }
 
-u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
+static u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
 {
     u8 levelBefore;
     u8 levelAfter;
@@ -210,7 +212,7 @@ u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     return levelAfter - levelBefore;
 }
 
-u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
+static u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
 {
     u8 levelDelta = sub_80416A0(dayCareData, slot);
     GetBoxMonNick(&dayCareData->mons[slot], gStringVar1);
@@ -218,7 +220,7 @@ u8 sub_80416E8(struct DayCareData *dayCareData, u8 slot)
     return levelDelta;
 }
 
-u16 sub_8041728(struct DayCareData *dayCareData, u8 slot)
+static u16 sub_8041728(struct DayCareData *dayCareData, u8 slot)
 {
     u16 cost;
 
@@ -247,7 +249,7 @@ u8 sub_80417B8(void)
     return 0;
 }
 
-void sub_80417F4(struct DayCareMail *mail)
+static void sub_80417F4(struct DayCareMail *mail)
 {
     u8 zero;
     u8 *names;
@@ -272,7 +274,7 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
         dayCareData->mail.extra.steps[slot] = 0;
         sub_80417F4(&dayCareData->mail.data[slot]);
     }
-    dayCareData->unk_118 = 0;
+    dayCareData->eggPersonalityLo = 0;
     dayCareData->unk_11a = 0;
 }
 
@@ -303,15 +305,15 @@ u16 sub_8041870(u16 species)
     return species;
 }
 
-void sub_80418F0(struct DayCareData *dayCareData)
+static void sub_80418F0(struct DayCareData *dayCareData)
 {
-    dayCareData->unk_118 = (Random() % 0xfffe) + 1;
+    dayCareData->eggPersonalityLo = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
 
-void sub_804191C(struct DayCareData *dayCareData)
+static void sub_804191C(struct DayCareData *dayCareData)
 {
-    dayCareData->unk_118 = Random() | 0x8000;
+    dayCareData->eggPersonalityLo = Random() | 0x8000;
     FlagSet(0x86);
 }
 
@@ -338,7 +340,7 @@ static void sub_8041960(u8 *data, u8 idx)
             data[j++] = temp[i];
 }
 
-void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
+static void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
 {
     u8 i;
     u8 selectedIvs[3];
@@ -386,6 +388,9 @@ void InheritIVs(struct Pokemon *egg, struct DayCareData *dayCareData)
     }
 }
 
+#ifdef NONMATCHING
+static
+#endif
 u8 pokemon_get_eggmoves(struct Pokemon *pokemon, u16 *eggMoves)
 {
     u16 eggMoveIdx;
@@ -416,13 +421,13 @@ u8 pokemon_get_eggmoves(struct Pokemon *pokemon, u16 *eggMoves)
     return numMovesFound;
 }
 
+#ifdef NONMATCHING
 extern u16 gUnknown_03000470[50];
 extern u16 gUnknown_030004D8[4];
 extern u16 gUnknown_030004E0[4];
 extern u16 gUnknown_030004E8[10];
 extern u16 gUnknown_03000500[4];
 
-#ifdef NONMATCHING
 void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
 {
     u16 numSharedParentMoves;
@@ -846,3 +851,139 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
                     "_08041E60: .4byte gUnknown_030004E0");
 }
 #endif
+
+static void RemoveEggFromDayCare(struct DayCareData *dayCareData)
+{
+    dayCareData->eggPersonalityLo = 0;
+    dayCareData->unk_11a = 0;
+}
+
+void sub_8041E7C(void)
+{
+    RemoveEggFromDayCare(&gSaveBlock1.daycareData);
+}
+
+static void incense_effects(u16 *species, struct DayCareData *dayCareData)
+{
+    u16 momItem, dadItem;
+    if (*species == SPECIES_WYNAUT || *species == SPECIES_AZURILL)
+    {
+        momItem = GetBoxMonData(&dayCareData->mons[0], MON_DATA_HELD_ITEM);
+        dadItem = GetBoxMonData(&dayCareData->mons[1], MON_DATA_HELD_ITEM);
+        if (*species == SPECIES_WYNAUT && momItem != ITEM_LAX_INCENSE && dadItem != ITEM_LAX_INCENSE)
+        {
+            *species = SPECIES_WOBBUFFET;
+        }
+        if (*species == SPECIES_AZURILL && momItem != ITEM_SEA_INCENSE && dadItem != ITEM_SEA_INCENSE)
+        {
+            *species = SPECIES_MARILL;
+        }
+    }
+}
+
+static u16 sub_8041EEC(struct DayCareData *dayCareData, u8 *a1) // inherit_species_from_mom
+{
+    u16 i;
+    u16 species[2];
+    u16 eggSpecies;
+    u8 buffer;
+    for (i=0; i<2; i++)
+    {
+        species[i] = GetBoxMonData(&dayCareData->mons[i], MON_DATA_SPECIES);
+        if (species[i] == SPECIES_DITTO)
+        {
+            a1[0] = i ^ 1;
+            a1[1] = i;
+        }
+        else if (GetBoxMonGender(&dayCareData->mons[i]) == MON_FEMALE)
+        {
+            a1[0] = i;
+            a1[1] = i ^ 1;
+        }
+    }
+    eggSpecies = sub_8041870(species[a1[0]]);
+    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->eggPersonalityLo & 0x8000)
+    {
+        eggSpecies = SPECIES_NIDORAN_M;
+    }
+    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->eggPersonalityLo & 0x8000)
+    {
+        eggSpecies = SPECIES_VOLBEAT;
+    }
+    if (species[a1[1]] == SPECIES_DITTO && GetBoxMonGender(&dayCareData->mons[a1[0]]) != MON_FEMALE)
+    {
+        buffer = a1[1];
+        a1[1] = a1[0];
+        a1[0] = buffer;
+    }
+    return eggSpecies;
+}
+
+static void sub_8041FC4(struct DayCareData *dayCareData) // give_egg
+{
+    struct Pokemon egg;
+    u16 species;
+    u8 parents[2];
+    u8 isEgg;
+    species = sub_8041EEC(dayCareData, parents);
+    incense_effects(&species, dayCareData);
+    sub_80420FC(&egg, species, dayCareData);
+    InheritIVs(&egg, dayCareData);
+    daycare_build_child_moveset(&egg, &dayCareData->mons[parents[1]], &dayCareData->mons[parents[0]]);
+    isEgg = TRUE;
+    SetMonData(&egg, MON_DATA_IS_EGG, &isEgg);
+    gPlayerParty[5] = egg;
+    party_compaction();
+    CalculatePlayerPartyCount();
+    RemoveEggFromDayCare(dayCareData);
+}
+
+
+void sub_8042044(struct Pokemon *mon, u16 species, u8 overwriteMetLocation) // scr_create_egg
+{
+    u8 metLevel;
+    u16 ball;
+    u8 language;
+    u8 metLocation;
+    u8 isEgg;
+    CreateMon(mon, species, 5, 0x20, FALSE, 0, FALSE, 0);
+    metLevel = 0;
+    ball = ITEM_POKE_BALL;
+    language = LANGUAGE_JAPANESE;
+    SetMonData(mon, MON_DATA_POKEBALL, (u8 *)&ball);
+    SetMonData(mon, MON_DATA_NICKNAME, gUnknown_08209AD4);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
+    SetMonData(mon, MON_DATA_LANGUAGE, &language);
+    if (overwriteMetLocation)
+    {
+        metLocation = 0xfd;
+        SetMonData(mon, MON_DATA_MET_LOCATION, &metLocation);
+    }
+    isEgg = TRUE;
+    SetMonData(mon, MON_DATA_IS_EGG, &isEgg);
+}
+
+static void sub_80420FC(struct Pokemon *mon, u16 species, struct DayCareData *dayCareData)
+{
+    u32 personality;
+    u16 ball;
+    u8 metLevel;
+    u8 language;
+    personality = dayCareData->eggPersonalityLo | (Random() << 16);
+    CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0);
+    metLevel = 0;
+    ball = ITEM_POKE_BALL;
+    language = LANGUAGE_JAPANESE;
+    SetMonData(mon, MON_DATA_POKEBALL, (u8 *)&ball);
+    SetMonData(mon, MON_DATA_NICKNAME, gUnknown_08209AD4);
+    SetMonData(mon, MON_DATA_FRIENDSHIP, &gBaseStats[species].eggCycles);
+    SetMonData(mon, MON_DATA_MET_LEVEL, &metLevel);
+    SetMonData(mon, MON_DATA_LANGUAGE, &language);
+}
+
+void sp0B8_daycare(void)
+{
+    sub_8041FC4(&gSaveBlock1.daycareData);
+}
+
-- 
cgit v1.2.3


From a1c5f2e6bad52af49dbf7de48ac78d4015dd073f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 16:42:05 -0400
Subject: Nonmatching sub_80421B0

---
 src/daycare.c | 200 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 182 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 1faaea4c6..5efec9810 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -20,6 +20,7 @@ extern u16 word_2024E82;
 
 static void sub_80417F4(struct DayCareMail *);
 static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
+u8 daycare_relationship_score(struct DayCareData *);
 
 const u8 *const gUnknown_08209AC4[] = {
     DaycareText_GetAlongVeryWell,
@@ -112,7 +113,7 @@ static void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * dayca
     }
     daycare_data->mons[empty_slot] = mon->box;
     BoxMonRestorePP(&daycare_data->mons[empty_slot]);
-    daycare_data->mail.extra.steps[empty_slot] = 0;
+    daycare_data->mail.extra.egg.steps[empty_slot] = 0;
     ZeroMonData(mon);
     party_compaction();
     CalculatePlayerPartyCount();
@@ -130,8 +131,8 @@ static void sub_80414C0(struct DayCareData * daycare_data)
         daycare_data->mons[0] = daycare_data->mons[1];
         ZeroBoxMonData(&daycare_data->mons[1]);
         daycare_data->mail.data[0] = daycare_data->mail.data[1];
-        daycare_data->mail.extra.steps[0] = daycare_data->mail.extra.steps[1];
-        daycare_data->mail.extra.steps[1] = 0;
+        daycare_data->mail.extra.egg.steps[0] = daycare_data->mail.extra.egg.steps[1];
+        daycare_data->mail.extra.egg.steps[1] = 0;
         sub_80417F4(&daycare_data->mail.data[1]);
     }
 }
@@ -172,7 +173,7 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     sub_803B4B4(&daycare_data->mons[slot], &pokemon);
     if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.steps[slot];
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.egg.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
         DayCare_LevelUpMoves(&pokemon);
     }
@@ -184,7 +185,7 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     }
     party_compaction();
     ZeroBoxMonData(&daycare_data->mons[slot]);
-    daycare_data->mail.extra.steps[slot] = 0;
+    daycare_data->mail.extra.egg.steps[slot] = 0;
     sub_80414C0(daycare_data);
     CalculatePlayerPartyCount();
     return species;
@@ -208,7 +209,7 @@ static u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     u8 levelAfter;
 
     levelBefore = GetLevelFromBoxMonExp(&daycareData->mons[slot]);
-    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.steps[slot]);
+    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.egg.steps[slot]);
     return levelAfter - levelBefore;
 }
 
@@ -238,8 +239,8 @@ void sub_8041770(void)
 
 void sub_8041790(u16 i)
 {
-    gSaveBlock1.daycareData.mail.extra.steps[0] += i;
-    gSaveBlock1.daycareData.mail.extra.steps[1] += i;
+    gSaveBlock1.daycareData.mail.extra.egg.steps[0] += i;
+    gSaveBlock1.daycareData.mail.extra.egg.steps[1] += i;
 }
 
 u8 sub_80417B8(void)
@@ -271,11 +272,11 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
     for (slot = 0; slot < ARRAY_COUNT(dayCareData->mons); slot ++)
     {
         ZeroBoxMonData(&dayCareData->mons[slot]);
-        dayCareData->mail.extra.steps[slot] = 0;
+        dayCareData->mail.extra.egg.steps[slot] = 0;
         sub_80417F4(&dayCareData->mail.data[slot]);
     }
-    dayCareData->eggPersonalityLo = 0;
-    dayCareData->unk_11a = 0;
+    dayCareData->mail.extra.egg.personalityLo = 0;
+    dayCareData->mail.extra.egg.unk_11a = 0;
 }
 
 u16 sub_8041870(u16 species)
@@ -307,13 +308,13 @@ u16 sub_8041870(u16 species)
 
 static void sub_80418F0(struct DayCareData *dayCareData)
 {
-    dayCareData->eggPersonalityLo = (Random() % 0xfffe) + 1;
+    dayCareData->mail.extra.egg.personalityLo = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
 
 static void sub_804191C(struct DayCareData *dayCareData)
 {
-    dayCareData->eggPersonalityLo = Random() | 0x8000;
+    dayCareData->mail.extra.egg.personalityLo = Random() | 0x8000;
     FlagSet(0x86);
 }
 
@@ -854,8 +855,8 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
 
 static void RemoveEggFromDayCare(struct DayCareData *dayCareData)
 {
-    dayCareData->eggPersonalityLo = 0;
-    dayCareData->unk_11a = 0;
+    dayCareData->mail.extra.egg.personalityLo = 0;
+    dayCareData->mail.extra.egg.unk_11a = 0;
 }
 
 void sub_8041E7C(void)
@@ -902,11 +903,11 @@ static u16 sub_8041EEC(struct DayCareData *dayCareData, u8 *a1) // inherit_speci
         }
     }
     eggSpecies = sub_8041870(species[a1[0]]);
-    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->eggPersonalityLo & 0x8000)
+    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->mail.extra.egg.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_NIDORAN_M;
     }
-    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->eggPersonalityLo & 0x8000)
+    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->mail.extra.egg.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_VOLBEAT;
     }
@@ -970,7 +971,7 @@ static void sub_80420FC(struct Pokemon *mon, u16 species, struct DayCareData *da
     u16 ball;
     u8 metLevel;
     u8 language;
-    personality = dayCareData->eggPersonalityLo | (Random() << 16);
+    personality = dayCareData->mail.extra.egg.personalityLo | (Random() << 16);
     CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0);
     metLevel = 0;
     ball = ITEM_POKE_BALL;
@@ -987,3 +988,166 @@ void sp0B8_daycare(void)
     sub_8041FC4(&gSaveBlock1.daycareData);
 }
 
+#ifdef NONMATCHING
+bool8 sub_80421B0(struct DayCareData *dayCareData)
+{
+    struct BoxPokemon *parent;
+    u32 i;
+    int v0;
+    int steps;
+    v0 = 0;
+    for (i=0, parent=&dayCareData->mons[0]; i<2; parent++, i++)
+    {
+        if (GetBoxMonData(parent, MON_DATA_SANITY_BIT2, v0))
+        {
+            dayCareData->mail.extra.egg.steps[i]++;
+            v0++;
+        }
+    }
+    if (dayCareData->mail.extra.egg.personalityLo == 0 && v0 == 2 && dayCareData->mail.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
+    {
+        sub_8041940();
+    }
+    if ((++dayCareData->mail.extra.egg.unk_11a) == 0xff)
+    {
+        for (i=0; i<gPlayerPartyCount; i++)
+        {
+            if (GetMonData(&gPlayerParty[i], MON_DATA_IS_EGG))
+            {
+                steps = GetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP);
+                if (steps == 0)
+                {
+                    gSpecialVar_0x8004 = i;
+                    return TRUE;
+                }
+                steps--;
+                SetMonData(&gPlayerParty[i], MON_DATA_FRIENDSHIP, (u8 *)&steps);
+            }
+        }
+    }
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 sub_80421B0(struct DayCareData *dayCareData)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tsub sp, 0x8\n"
+                    "\tadds r7, r0, 0\n"
+                    "\tmovs r2, 0\n"
+                    "\tmovs r6, 0\n"
+                    "\tadds r5, r7, 0\n"
+                    "_080421BC:\n"
+                    "\tlsls r4, r6, 2\n"
+                    "\tadds r0, r5, 0\n"
+                    "\tmovs r1, 0x5\n"
+                    "\tstr r2, [sp, 0x4]\n"
+                    "\tbl GetBoxMonData\n"
+                    "\tldr r2, [sp, 0x4]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080421DE\n"
+                    "\tmovs r0, 0x88\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r1, r7, r0\n"
+                    "\tadds r1, r4\n"
+                    "\tldr r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstr r0, [r1]\n"
+                    "\tadds r2, 0x1\n"
+                    "_080421DE:\n"
+                    "\tadds r5, 0x50\n"
+                    "\tadds r6, 0x1\n"
+                    "\tcmp r6, 0x1\n"
+                    "\tbls _080421BC\n"
+                    "\tmovs r1, 0x8C\n"
+                    "\tlsls r1, 1\n"
+                    "\tadds r0, r7, r1\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _08042226\n"
+                    "\tcmp r2, 0x2\n"
+                    "\tbne _08042226\n"
+                    "\tsubs r1, 0x4\n"
+                    "\tadds r0, r7, r1\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbne _08042226\n"
+                    "\tadds r0, r7, 0\n"
+                    "\tbl daycare_relationship_score\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tlsls r4, 24\n"
+                    "\tlsrs r4, 24\n"
+                    "\tbl Random\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r0, 16\n"
+                    "\tmovs r1, 0x64\n"
+                    "\tmuls r0, r1\n"
+                    "\tldr r1, _08042240 @ =0x0000ffff\n"
+                    "\tbl __udivsi3\n"
+                    "\tcmp r4, r0\n"
+                    "\tbls _08042226\n"
+                    "\tbl sub_8041940\n"
+                    "_08042226:\n"
+                    "\tmovs r0, 0x8D\n"
+                    "\tlsls r0, 1\n"
+                    "\tadds r1, r7, r0\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r1]\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r0, 24\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbne _08042290\n"
+                    "\tmovs r6, 0\n"
+                    "\tb _08042288\n"
+                    "\t.align 2, 0\n"
+                    "_08042240: .4byte 0x0000ffff\n"
+                    "_08042244:\n"
+                    "\tmovs r0, 0x64\n"
+                    "\tadds r1, r6, 0\n"
+                    "\tmuls r1, r0\n"
+                    "\tldr r0, _08042270 @ =gPlayerParty\n"
+                    "\tadds r4, r1, r0\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x2D\n"
+                    "\tbl GetMonData\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _08042286\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x20\n"
+                    "\tbl GetMonData\n"
+                    "\tstr r0, [sp]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _08042278\n"
+                    "\tldr r0, _08042274 @ =gSpecialVar_0x8004\n"
+                    "\tstrh r6, [r0]\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tb _08042292\n"
+                    "\t.align 2, 0\n"
+                    "_08042270: .4byte gPlayerParty\n"
+                    "_08042274: .4byte gSpecialVar_0x8004\n"
+                    "_08042278:\n"
+                    "\tsubs r0, 0x1\n"
+                    "\tstr r0, [sp]\n"
+                    "\tadds r0, r4, 0\n"
+                    "\tmovs r1, 0x20\n"
+                    "\tmov r2, sp\n"
+                    "\tbl SetMonData\n"
+                    "_08042286:\n"
+                    "\tadds r6, 0x1\n"
+                    "_08042288:\n"
+                    "\tldr r0, _0804229C @ =gPlayerPartyCount\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r6, r0\n"
+                    "\tbcc _08042244\n"
+                    "_08042290:\n"
+                    "\tmovs r0, 0\n"
+                    "_08042292:\n"
+                    "\tadd sp, 0x8\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1\n"
+                    "\t.align 2, 0\n"
+                    "_0804229C: .4byte gPlayerPartyCount");
+}
+#endif
-- 
cgit v1.2.3


From 01f37837b1b56efa4db862a3a742f4c6034ea363 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 16:46:51 -0400
Subject: Through daycare_relationship_score (nonmatching)

---
 src/daycare.c | 293 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 291 insertions(+), 2 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3


From d26e349392d745b4b7d12fedb08559b636b4ac09 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 16:50:11 -0400
Subject: through sp0B9_daycare_relationship_comment

---
 src/daycare.c | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index e0dc83962..4f6d2e1d1 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1440,3 +1440,26 @@ u8 daycare_relationship_score(struct DayCareData *dayCareData)
                     "\tbx r1");
 }
 #endif
+
+u8 daycare_relationship_score_from_savegame(void)
+{
+    return daycare_relationship_score(&gSaveBlock1.daycareData);
+}
+
+void sp0B9_daycare_relationship_comment(void)
+{
+    u8 whichString;
+    u8 relationshipScore;
+
+    relationshipScore = daycare_relationship_score_from_savegame();
+    whichString = 0;
+    if (relationshipScore == 0)
+        whichString = 3;
+    if (relationshipScore == 20)
+        whichString = 2;
+    if (relationshipScore == 50)
+        whichString = 1;
+    if (relationshipScore == 70)
+        whichString = 0;
+    StringCopy(gStringVar4, gUnknown_08209AC4[whichString]);
+}
-- 
cgit v1.2.3


From 3d0ed365b41a5be040bee12bab3bcb502ad44eee Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 17:36:29 -0400
Subject: Through DaycareLevelMenuGetText

---
 src/daycare.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 136 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 4f6d2e1d1..e39c39f71 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -11,6 +11,7 @@
 #include "pokemon_storage_system.h"
 #include "rng.h"
 #include "moves.h"
+#include "trade.h"
 #include "strings2.h"
 #include "data/pokemon/egg_moves.h"
 #include "party_menu.h"
@@ -1463,3 +1464,138 @@ void sp0B9_daycare_relationship_comment(void)
         whichString = 0;
     StringCopy(gStringVar4, gUnknown_08209AC4[whichString]);
 }
+
+#ifdef NONMATCHING
+bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
+{
+    u8 i;
+    u8 flags[2];
+
+    // This portion is nonmatching
+    flags[1] = 0;
+    flags[0] = 0;
+    for (i = 0; name[i] != EOS; i ++)
+    // End nonmatching portion
+
+    {
+        if (name[i] == CHAR_MALE) flags[0] ++;
+        if (name[i] == CHAR_FEMALE) flags[1] ++;
+    }
+    if (genderRatio == MON_MALE && flags[0] && !flags[1]) return TRUE;
+    if (genderRatio == MON_FEMALE && flags[1] && !flags[0]) return TRUE;
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
+{
+    asm_unified("\n"
+                    "\tpush {r4,r5,lr}\n"
+                    "\tsub sp, 0x4\n"
+                    "\tadds r4, r0, 0\n"
+                    "\tlsls r1, 24\n"
+                    "\tlsrs r5, r1, 24\n"
+                    "\tmov r2, sp\n"
+                    "\tmov r1, sp\n"
+                    "\tmovs r0, 0\n"
+                    "\tstrb r0, [r1, 0x1]\n"
+                    "\tstrb r0, [r2]\n"
+                    "\tmovs r3, 0\n"
+                    "\tldrb r0, [r4]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbeq _0804258C\n"
+                    "_08042564:\n"
+                    "\tadds r1, r4, r3\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tcmp r0, 0xB5\n"
+                    "\tbne _08042572\n"
+                    "\tldrb r0, [r2]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r2]\n"
+                    "_08042572:\n"
+                    "\tldrb r0, [r1]\n"
+                    "\tcmp r0, 0xB6\n"
+                    "\tbne _0804257E\n"
+                    "\tldrb r0, [r2, 0x1]\n"
+                    "\tadds r0, 0x1\n"
+                    "\tstrb r0, [r2, 0x1]\n"
+                    "_0804257E:\n"
+                    "\tadds r0, r3, 0x1\n"
+                    "\tlsls r0, 24\n"
+                    "\tlsrs r3, r0, 24\n"
+                    "\tadds r0, r4, r3\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0xFF\n"
+                    "\tbne _08042564\n"
+                    "_0804258C:\n"
+                    "\tcmp r5, 0\n"
+                    "\tbne _080425A0\n"
+                    "\tmov r0, sp\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080425A0\n"
+                    "\tmov r0, sp\n"
+                    "\tldrb r0, [r0, 0x1]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080425B4\n"
+                    "_080425A0:\n"
+                    "\tcmp r5, 0xFE\n"
+                    "\tbne _080425B8\n"
+                    "\tmov r0, sp\n"
+                    "\tldrb r0, [r0, 0x1]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbeq _080425B8\n"
+                    "\tmov r0, sp\n"
+                    "\tldrb r0, [r0]\n"
+                    "\tcmp r0, 0\n"
+                    "\tbne _080425B8\n"
+                    "_080425B4:\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tb _080425BA\n"
+                    "_080425B8:\n"
+                    "\tmovs r0, 0\n"
+                    "_080425BA:\n"
+                    "\tadd sp, 0x4\n"
+                    "\tpop {r4,r5}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1");
+}
+#endif
+
+u8 *AppendGenderSymbol(u8 *name, u8 gender)
+{
+    if (gender == MON_MALE)
+    {
+        if (!NameHasGenderSymbol(name, MON_MALE))
+            return StringAppend(name, gOtherText_MaleSymbol3);
+    }
+
+    else if (gender == MON_FEMALE)
+    {
+        if (!NameHasGenderSymbol(name, MON_FEMALE))
+            return StringAppend(name, gOtherText_FemaleSymbol3);
+    }
+    return StringAppend(name, gOtherText_GenderlessSymbol);
+}
+
+u8 *MonAppendGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
+{
+    return AppendGenderSymbol(name, GetBoxMonGender(boxMon));
+}
+
+void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
+{
+    u8 buffers[2][20];
+    u8 i;
+    *dest = EOS;
+    for (i = 0; i < 2; i ++)
+    {
+        GetBoxMonNick(&dayCareData->mons[i], buffers[i]);
+        MonAppendGenderSymbol(buffers[i], &dayCareData->mons[i]);
+    }
+    StringCopy(dest, buffers[0]);
+    StringAppend(dest, gOtherText_NewLine2);
+    StringAppend(dest, buffers[1]);
+    StringAppend(dest, gOtherText_NewLine2);
+    StringAppend(dest, gOtherText_CancelAndLv);
+}
-- 
cgit v1.2.3


From d73bd667323a309c3a38d380bcb0c644a101a251 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 17:43:31 -0400
Subject: DaycareLevelMenuGetLevelText

---
 src/daycare.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index e39c39f71..e4dc2cc45 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1599,3 +1599,24 @@ void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
     StringAppend(dest, gOtherText_NewLine2);
     StringAppend(dest, gOtherText_CancelAndLv);
 }
+
+void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
+{
+    u8 i;
+    u8 level;
+    *dest = EOS;
+    for (i = 0; i < 2; i ++)
+    {
+        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.extra.egg.steps[i]);
+        dest[0] = 0x34;
+        dest[1] = 0xFC;
+        dest[2] = 0x14;
+        dest[3] = 0x06;
+        dest = ConvertIntToDecimalStringN(dest + 4, level, STR_CONV_MODE_RIGHT_ALIGN, 3);
+        dest[0] = 0xFC;
+        dest[1] = 0x14;
+        dest[2] = 0x00;
+        dest = StringCopy(dest + 3, gOtherText_NewLine2);
+    }
+    *dest = EOS;
+}
-- 
cgit v1.2.3


From 50e82f84d6d379b6e94e7f70a7de47361156ad0f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 17:51:25 -0400
Subject: DaycareLevelMenuProcessKeyInput

---
 src/daycare.c | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index e4dc2cc45..8a86c9205 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -16,6 +16,11 @@
 #include "data/pokemon/egg_moves.h"
 #include "party_menu.h"
 #include "field_effect.h"
+#include "main.h"
+#include "menu.h"
+#include "sound.h"
+#include "songs.h"
+#include "script.h"
 
 extern u16 word_2024E82;
 
@@ -1620,3 +1625,42 @@ void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
     }
     *dest = EOS;
 }
+
+void DaycareLevelMenuProcessKeyInput(u8 taskId)
+{
+    if (gMain.newKeys & DPAD_UP)
+    {
+        if (gTasks[taskId].data[0] != 0)
+        {
+            gTasks[taskId].data[0] --;
+            MoveMenuCursor(-1);
+            PlaySE(SE_SELECT);
+        }
+    }
+    else if (gMain.newKeys & DPAD_DOWN)
+    {
+        if (gTasks[taskId].data[0] != 2)
+        {
+            gTasks[taskId].data[0] ++;
+            MoveMenuCursor(+1);
+            PlaySE(SE_SELECT);
+        }
+    }
+    else if (gMain.newKeys & A_BUTTON)
+    {
+        HandleDestroyMenuCursors();
+        PlaySE(SE_SELECT);
+        gLastFieldPokeMenuOpened = gScriptResult = gTasks[taskId].data[0];
+        DestroyTask(taskId);
+        MenuZeroFillWindowRect(15, 6, 29, 13);
+        EnableBothScriptContexts();
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        HandleDestroyMenuCursors();
+        gLastFieldPokeMenuOpened = gScriptResult = 2;
+        DestroyTask(taskId);
+        MenuZeroFillWindowRect(15, 6, 29, 13);
+        EnableBothScriptContexts();
+    }
+}
-- 
cgit v1.2.3


From 5a939d216b0b2ee84e3adbf2c1678bfee475bbaa Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 30 Aug 2017 17:56:31 -0400
Subject: Finish decompilation of daycare

---
 src/daycare.c | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 8a86c9205..63f3a6861 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -21,6 +21,7 @@
 #include "sound.h"
 #include "songs.h"
 #include "script.h"
+#include "rom4.h"
 
 extern u16 word_2024E82;
 
@@ -1664,3 +1665,21 @@ void DaycareLevelMenuProcessKeyInput(u8 taskId)
         EnableBothScriptContexts();
     }
 }
+
+void ShowDaycareLevelMenu(void)
+{
+    u8 buffer[100];
+    MenuDrawTextWindow(15, 6, 29, 13);
+    DaycareLevelMenuGetText(&gSaveBlock1.daycareData, buffer);
+    MenuPrint(buffer, 16, 7);
+    DaycareLevelMenuGetLevelText(&gSaveBlock1.daycareData, buffer);
+    MenuPrint_PixelCoords(buffer, 0xce, 0x38, TRUE);
+    InitMenu(0, 16, 7, 3, 0, 13);
+    CreateTask(DaycareLevelMenuProcessKeyInput, 3);
+}
+
+void ChooseSendDaycareMon(void)
+{
+    OpenPartyMenu(6, 0);
+    gMain.savedCallback = c2_exit_to_overworld_2_switch;
+}
-- 
cgit v1.2.3


From e8d49bf6287142fcb463f416bb7edfd62c053959 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 30 Aug 2017 18:29:31 -0400
Subject: Make static what of the remainder should be static

---
 src/daycare.c         | 27 +++++++++++++++------------
 src/mori_debug_menu.c |  8 ++++----
 2 files changed, 19 insertions(+), 16 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 63f3a6861..77786f3d1 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -27,7 +27,7 @@ extern u16 word_2024E82;
 
 static void sub_80417F4(struct DayCareMail *);
 static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
-u8 daycare_relationship_score(struct DayCareData *);
+static u8 daycare_relationship_score(struct DayCareData *);
 
 const u8 *const gUnknown_08209AC4[] = {
     DaycareText_GetAlongVeryWell,
@@ -996,7 +996,7 @@ void sp0B8_daycare(void)
 }
 
 #ifdef NONMATCHING
-bool8 sub_80421B0(struct DayCareData *dayCareData)
+static bool8 sub_80421B0(struct DayCareData *dayCareData)
 {
     struct BoxPokemon *parent;
     u32 i;
@@ -1036,7 +1036,7 @@ bool8 sub_80421B0(struct DayCareData *dayCareData)
 }
 #else
 __attribute__((naked))
-bool8 sub_80421B0(struct DayCareData *dayCareData)
+static bool8 sub_80421B0(struct DayCareData *dayCareData)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tsub sp, 0x8\n"
@@ -1164,12 +1164,12 @@ bool8 sub_80422A0(void)
     return sub_80421B0(&gSaveBlock1.daycareData);
 }
 
-bool8 sub_80422B4(struct DayCareData *dayCareData)
+static 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)
+static void sub_80422C4(struct DayCareData *dayCareData)
 {
     u8 language;
     if (GetBoxMonData(&dayCareData->mons[0], MON_DATA_SPECIES) != 0)
@@ -1211,6 +1211,9 @@ u8 sp0B6_daycare(void)
     return 0;
 }
 
+#ifdef NONMATCHING
+static
+#endif
 bool8 sub_80423A8(u16 *a, u16 *b)
 {
     int i, j;
@@ -1229,7 +1232,7 @@ bool8 sub_80423A8(u16 *a, u16 *b)
 }
 
 #ifdef NONMATCHING
-u8 daycare_relationship_score(struct DayCareData *dayCareData)
+static u8 daycare_relationship_score(struct DayCareData *dayCareData)
 {
     u16 species[2];
     u32 otIds[2];
@@ -1297,7 +1300,7 @@ u8 daycare_relationship_score(struct DayCareData *dayCareData)
 }
 #else
 __attribute__((naked))
-u8 daycare_relationship_score(struct DayCareData *dayCareData)
+static u8 daycare_relationship_score(struct DayCareData *dayCareData)
 {
     asm_unified("\tpush {r4-r7,lr}\n"
                     "\tmov r7, r10\n"
@@ -1568,7 +1571,7 @@ bool8 NameHasGenderSymbol(const u8 *name, u8 genderRatio)
 }
 #endif
 
-u8 *AppendGenderSymbol(u8 *name, u8 gender)
+static u8 *AppendGenderSymbol(u8 *name, u8 gender)
 {
     if (gender == MON_MALE)
     {
@@ -1584,12 +1587,12 @@ u8 *AppendGenderSymbol(u8 *name, u8 gender)
     return StringAppend(name, gOtherText_GenderlessSymbol);
 }
 
-u8 *MonAppendGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
+static u8 *MonAppendGenderSymbol(u8 *name, struct BoxPokemon *boxMon)
 {
     return AppendGenderSymbol(name, GetBoxMonGender(boxMon));
 }
 
-void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
+static void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
 {
     u8 buffers[2][20];
     u8 i;
@@ -1606,7 +1609,7 @@ void DaycareLevelMenuGetText(struct DayCareData *dayCareData, u8 *dest)
     StringAppend(dest, gOtherText_CancelAndLv);
 }
 
-void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
+static void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
 {
     u8 i;
     u8 level;
@@ -1627,7 +1630,7 @@ void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *dest)
     *dest = EOS;
 }
 
-void DaycareLevelMenuProcessKeyInput(u8 taskId)
+static void DaycareLevelMenuProcessKeyInput(u8 taskId)
 {
     if (gMain.newKeys & DPAD_UP)
     {
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index df3446d3e..a00b3bf71 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -52,7 +52,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
     u16 monData;
     u16 var;
 
-    monData = GetMonData(gPlayerParty, 11, ptr);
+    monData = GetMonData(gPlayerParty, MON_DATA_SPECIES, ptr);
     var = sub_8041870(monData);
     StringCopy(localPtr, gSpeciesNames[monData]);
     StringAppend(localPtr, gUnknown_0839B24D);
@@ -67,7 +67,7 @@ u8 MoriDebugMenu_SearchChild(u8 a1, u8 a2, u8 *ptr)
 
 s8 MoriDebugMenu_Egg(void)
 {
-    if ( Daycare_CountPokemon(gSaveBlock1.daycareData.mons) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(&gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041940();
     CloseMenu();
 
@@ -76,7 +76,7 @@ s8 MoriDebugMenu_Egg(void)
 
 s8 MoriDebugMenu_MaleEgg(void)
 {
-    if ( Daycare_CountPokemon(gSaveBlock1.daycareData.mons) == 2 && daycare_relationship_score_from_savegame() )
+    if ( Daycare_CountPokemon(&gSaveBlock1.daycareData) == 2 && daycare_relationship_score_from_savegame() )
         sub_8041950();
     CloseMenu();
 
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.daycareData.unk_11a = -3;
+    gSaveBlock1.daycareData.mail.extra.egg.unk_11a = -3;
     CloseMenu();
     return 1;
 }
-- 
cgit v1.2.3


From b7f9479bdb37f12774f7e31a934a3dd5e8f821e0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 30 Aug 2017 19:04:07 -0400
Subject: Fix building

---
 src/daycare.c         | 56 +++++++++++++++++++++++++--------------------------
 src/mori_debug_menu.c |  2 +-
 src/record_mixing.c   |  8 ++++----
 3 files changed, 33 insertions(+), 33 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index 77786f3d1..b0f7a193f 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -66,7 +66,7 @@ u8 Daycare_CountPokemon(struct DayCareData *daycare_data)
     return count;
 }
 
-void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * daycareMailEtc)
+void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixingDayCareMail * daycareMailEtc)
 {
     u8 i;
     u8 specCount;
@@ -78,17 +78,17 @@ void sub_8041324(struct BoxPokemon * box_pokemon, struct DayCareMailEtc * daycar
             specCount ++;
             if (GetBoxMonData(&box_pokemon[i], MON_DATA_HELD_ITEM) == ITEM_NONE)
             {
-                daycareMailEtc->extra.rc.unk74[i] = 0;
+                daycareMailEtc->unk74[i] = 0;
             } else
             {
-                daycareMailEtc->extra.rc.unk74[i] = 1;
+                daycareMailEtc->unk74[i] = 1;
             }
         } else
         {
-            daycareMailEtc->extra.rc.unk74[i] = 1;
+            daycareMailEtc->unk74[i] = 1;
         }
     }
-    daycareMailEtc->extra.rc.unk70 = specCount;
+    daycareMailEtc->unk70 = specCount;
 }
 
 static s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
@@ -120,7 +120,7 @@ static void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * dayca
     }
     daycare_data->mons[empty_slot] = mon->box;
     BoxMonRestorePP(&daycare_data->mons[empty_slot]);
-    daycare_data->mail.extra.egg.steps[empty_slot] = 0;
+    daycare_data->mail.egg.steps[empty_slot] = 0;
     ZeroMonData(mon);
     party_compaction();
     CalculatePlayerPartyCount();
@@ -138,8 +138,8 @@ static void sub_80414C0(struct DayCareData * daycare_data)
         daycare_data->mons[0] = daycare_data->mons[1];
         ZeroBoxMonData(&daycare_data->mons[1]);
         daycare_data->mail.data[0] = daycare_data->mail.data[1];
-        daycare_data->mail.extra.egg.steps[0] = daycare_data->mail.extra.egg.steps[1];
-        daycare_data->mail.extra.egg.steps[1] = 0;
+        daycare_data->mail.egg.steps[0] = daycare_data->mail.egg.steps[1];
+        daycare_data->mail.egg.steps[1] = 0;
         sub_80417F4(&daycare_data->mail.data[1]);
     }
 }
@@ -180,7 +180,7 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     sub_803B4B4(&daycare_data->mons[slot], &pokemon);
     if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.extra.egg.steps[slot];
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.egg.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
         DayCare_LevelUpMoves(&pokemon);
     }
@@ -192,7 +192,7 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     }
     party_compaction();
     ZeroBoxMonData(&daycare_data->mons[slot]);
-    daycare_data->mail.extra.egg.steps[slot] = 0;
+    daycare_data->mail.egg.steps[slot] = 0;
     sub_80414C0(daycare_data);
     CalculatePlayerPartyCount();
     return species;
@@ -216,7 +216,7 @@ static u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     u8 levelAfter;
 
     levelBefore = GetLevelFromBoxMonExp(&daycareData->mons[slot]);
-    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.extra.egg.steps[slot]);
+    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.egg.steps[slot]);
     return levelAfter - levelBefore;
 }
 
@@ -246,8 +246,8 @@ void sub_8041770(void)
 
 void sub_8041790(u16 i)
 {
-    gSaveBlock1.daycareData.mail.extra.egg.steps[0] += i;
-    gSaveBlock1.daycareData.mail.extra.egg.steps[1] += i;
+    gSaveBlock1.daycareData.mail.egg.steps[0] += i;
+    gSaveBlock1.daycareData.mail.egg.steps[1] += i;
 }
 
 u8 sub_80417B8(void)
@@ -279,11 +279,11 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
     for (slot = 0; slot < ARRAY_COUNT(dayCareData->mons); slot ++)
     {
         ZeroBoxMonData(&dayCareData->mons[slot]);
-        dayCareData->mail.extra.egg.steps[slot] = 0;
+        dayCareData->mail.egg.steps[slot] = 0;
         sub_80417F4(&dayCareData->mail.data[slot]);
     }
-    dayCareData->mail.extra.egg.personalityLo = 0;
-    dayCareData->mail.extra.egg.unk_11a = 0;
+    dayCareData->mail.egg.personalityLo = 0;
+    dayCareData->mail.egg.unk_11a = 0;
 }
 
 u16 sub_8041870(u16 species)
@@ -315,13 +315,13 @@ u16 sub_8041870(u16 species)
 
 static void sub_80418F0(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.extra.egg.personalityLo = (Random() % 0xfffe) + 1;
+    dayCareData->mail.egg.personalityLo = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
 
 static void sub_804191C(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.extra.egg.personalityLo = Random() | 0x8000;
+    dayCareData->mail.egg.personalityLo = Random() | 0x8000;
     FlagSet(0x86);
 }
 
@@ -862,8 +862,8 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
 
 static void RemoveEggFromDayCare(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.extra.egg.personalityLo = 0;
-    dayCareData->mail.extra.egg.unk_11a = 0;
+    dayCareData->mail.egg.personalityLo = 0;
+    dayCareData->mail.egg.unk_11a = 0;
 }
 
 void sub_8041E7C(void)
@@ -910,11 +910,11 @@ static u16 sub_8041EEC(struct DayCareData *dayCareData, u8 *a1) // inherit_speci
         }
     }
     eggSpecies = sub_8041870(species[a1[0]]);
-    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->mail.extra.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->mail.egg.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_NIDORAN_M;
     }
-    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->mail.extra.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->mail.egg.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_VOLBEAT;
     }
@@ -978,7 +978,7 @@ static void sub_80420FC(struct Pokemon *mon, u16 species, struct DayCareData *da
     u16 ball;
     u8 metLevel;
     u8 language;
-    personality = dayCareData->mail.extra.egg.personalityLo | (Random() << 16);
+    personality = dayCareData->mail.egg.personalityLo | (Random() << 16);
     CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0);
     metLevel = 0;
     ball = ITEM_POKE_BALL;
@@ -1007,15 +1007,15 @@ static bool8 sub_80421B0(struct DayCareData *dayCareData)
     {
         if (GetBoxMonData(parent, MON_DATA_SANITY_BIT2, v0))
         {
-            dayCareData->mail.extra.egg.steps[i]++;
+            dayCareData->mail.egg.steps[i]++;
             v0++;
         }
     }
-    if (dayCareData->mail.extra.egg.personalityLo == 0 && v0 == 2 && dayCareData->mail.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
+    if (dayCareData->mail.egg.personalityLo == 0 && v0 == 2 && dayCareData->mail.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
     {
         sub_8041940();
     }
-    if ((++dayCareData->mail.extra.egg.unk_11a) == 0xff)
+    if ((++dayCareData->mail.egg.unk_11a) == 0xff)
     {
         for (i=0; i<gPlayerPartyCount; i++)
         {
@@ -1166,7 +1166,7 @@ bool8 sub_80422A0(void)
 
 static bool8 sub_80422B4(struct DayCareData *dayCareData)
 {
-    return (u32)((-dayCareData->mail.extra.egg.personalityLo) | dayCareData->mail.extra.egg.personalityLo) >> 31;
+    return (u32)((-dayCareData->mail.egg.personalityLo) | dayCareData->mail.egg.personalityLo) >> 31;
 }
 
 static void sub_80422C4(struct DayCareData *dayCareData)
@@ -1616,7 +1616,7 @@ static void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *de
     *dest = EOS;
     for (i = 0; i < 2; i ++)
     {
-        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.extra.egg.steps[i]);
+        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.egg.steps[i]);
         dest[0] = 0x34;
         dest[1] = 0xFC;
         dest[2] = 0x14;
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index a00b3bf71..62837c8e6 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.daycareData.mail.extra.egg.unk_11a = -3;
+    gSaveBlock1.daycareData.mail.egg.unk_11a = -3;
     CloseMenu();
     return 1;
 }
diff --git a/src/record_mixing.c b/src/record_mixing.c
index aa6d2c5a9..7c46d4d0a 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -29,7 +29,7 @@ extern u8 ewram[];
 #define unk_2018000 (*(struct PlayerRecords *)(ewram + 0x18000))
 #define unk_2008000 (*(struct PlayerRecords *)(ewram + 0x08000))
 
-extern struct DayCareMailEtc gUnknown_02038738;
+extern struct RecordMixingDayCareMail gUnknown_02038738;
 extern u16 gSpecialVar_0x8005;
 
 u32 gUnknown_03005D2C;
@@ -42,7 +42,7 @@ void *recordMixingTvShows = &gSaveBlock1.tvShows;
 void *gUnknown_083D0274 = &gSaveBlock1.unknown_2ABC;
 void *gUnknown_083D0278 = &gSaveBlock1.oldMan;
 void *recordMixingEasyChatPairs = &gSaveBlock1.easyChatPairs;
-struct DayCareMailEtc *gUnknown_083D0280 = &gUnknown_02038738;
+struct RecordMixingDayCareMail *gUnknown_083D0280 = &gUnknown_02038738;
 void *gUnknown_083D0284 = &gSaveBlock2.filler_A8;
 
 #define BUFFER_CHUNK_SIZE 200
@@ -59,7 +59,7 @@ struct PlayerRecords
     u8 filler1004[0x40];
     u8 filler1044[0x40];
     struct EasyChatPair easyChatPairs[5];
-    struct DayCareMailEtc filler10AC;
+    struct RecordMixingDayCareMail filler10AC;
     u8 filler1124[0xA4];
     u16 filler11C8[0x34];
 };
@@ -77,7 +77,7 @@ void RecordMixing_PrepareExchangePacket(void)
     gUnknown_02038738.data[0] = gSaveBlock1.daycareData.mail.data[0];
     gUnknown_02038738.data[1] = gSaveBlock1.daycareData.mail.data[1];
     sub_8041324(gSaveBlock1.daycareData.mons, &gUnknown_02038738);
-    memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct DayCareMailEtc));
+    memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail));
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, sizeof(unk_2018000.filler1124));
 
     if (GetMultiplayerId() == 0)
-- 
cgit v1.2.3


From 170c82f299905b6e55b20a5c2c04f92353131d0e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 28 Sep 2017 21:25:54 -0400
Subject: Remove all hardcoded labels in sym_bss.txt

---
 src/battle_anim_80CA710.c | 18 ++++++++++++++++++
 src/daycare.c             | 11 ++++++-----
 src/easy_chat.c           |  2 ++
 src/field_weather.c       |  2 +-
 src/mauville_old_man.c    |  2 ++
 src/pokenav.c             |  2 ++
 src/trade.c               |  1 +
 7 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 src/battle_anim_80CA710.c

(limited to 'src')

diff --git a/src/battle_anim_80CA710.c b/src/battle_anim_80CA710.c
new file mode 100644
index 000000000..65ccd7c21
--- /dev/null
+++ b/src/battle_anim_80CA710.c
@@ -0,0 +1,18 @@
+
+// Includes
+#include "global.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+IWRAM_DATA u32 filler_03000724;
+IWRAM_DATA u16 gUnknown_03000728[4];
+IWRAM_DATA u16 gUnknown_03000730[6];
+IWRAM_DATA u32 filler_0300073c;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/daycare.c b/src/daycare.c
index b0f7a193f..717e37330 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -25,6 +25,12 @@
 
 extern u16 word_2024E82;
 
+IWRAM_DATA u16 gUnknown_03000470[52];
+IWRAM_DATA u16 gUnknown_030004D8[4];
+IWRAM_DATA u16 gUnknown_030004E0[4];
+IWRAM_DATA u16 gUnknown_030004E8[12];
+IWRAM_DATA u16 gUnknown_03000500[4];
+
 static void sub_80417F4(struct DayCareMail *);
 static void sub_80420FC(struct Pokemon *, u16, struct DayCareData *);
 static u8 daycare_relationship_score(struct DayCareData *);
@@ -430,11 +436,6 @@ u8 pokemon_get_eggmoves(struct Pokemon *pokemon, u16 *eggMoves)
 }
 
 #ifdef NONMATCHING
-extern u16 gUnknown_03000470[50];
-extern u16 gUnknown_030004D8[4];
-extern u16 gUnknown_030004E0[4];
-extern u16 gUnknown_030004E8[10];
-extern u16 gUnknown_03000500[4];
 
 void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, struct BoxPokemon *mom)
 {
diff --git a/src/easy_chat.c b/src/easy_chat.c
index cca8c1355..f3673c8fa 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -19,6 +19,8 @@ extern const u8 gEasyChatGroupSizes[];
 
 extern u16 gSpecialVar_0x8004;
 
+IWRAM_DATA u8 gUnknown_03000740;
+
 
 u8 *sub_80EB3FC(u8 *dst, u16 word)
 {
diff --git a/src/field_weather.c b/src/field_weather.c
index 5ff2eddf9..443a38357 100644
--- a/src/field_weather.c
+++ b/src/field_weather.c
@@ -55,7 +55,7 @@ extern struct Weather gWeather;
 extern u8 *gUnknown_083970E8;
 extern u8 (*gUnknown_08396FC8[][4])(void);
 extern u8 (*gUnknown_083970B8[])(void);
-extern u8 *gUnknown_030006DC;
+IWRAM_DATA u8 *gUnknown_030006DC;
 extern u8 gUnknown_083970C8;
 extern u8 (*gUnknown_0202FC48)[32];
 extern u8 gUnknown_0202F9E8[32];
diff --git a/src/mauville_old_man.c b/src/mauville_old_man.c
index 93684fc60..789a251e6 100644
--- a/src/mauville_old_man.c
+++ b/src/mauville_old_man.c
@@ -16,6 +16,8 @@ extern u32 gUnknown_083E53A8[];
 
 extern u16 gUnknown_083E537C[];
 
+IWRAM_DATA u8 gUnknown_03000748;
+
 void sub_80F7A34(void)
 {
     u16 i;
diff --git a/src/pokenav.c b/src/pokenav.c
index 84ed7b14b..21d7bb4e3 100644
--- a/src/pokenav.c
+++ b/src/pokenav.c
@@ -38,3 +38,5 @@ void sub_80F700C(u8 *arg0, u16 arg1) {
     ptr[2] = 0x80;
     ptr[3] = 0xFF;
 }
+
+IWRAM_DATA MainCallback gUnknown_03000744;
diff --git a/src/trade.c b/src/trade.c
index cb190d194..0816fe555 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -37,6 +37,7 @@ struct UnkStructD {
 extern const struct InGameTrade gIngameTrades[];
 extern const u16 gIngameTradeMail[][10];
 
+IWRAM_DATA u8 gUnknown_03000508[8];
 
 void sub_804A96C(struct UnkStructD *arg0, u8 left, u8 top, u16 *tilemap, u8 width, u8 height, u16 sp8) {
     int y, x;
-- 
cgit v1.2.3


From 9f736e58afff3e3e3be1398ceebac93614ec70e1 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 29 Sep 2017 22:25:20 -0400
Subject: Rename daycare structs to be slightly less insensible

---
 src/daycare.c         | 66 +++++++++++++++++++++++++--------------------------
 src/mori_debug_menu.c |  2 +-
 src/record_mixing.c   | 14 +++++------
 3 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'src')

diff --git a/src/daycare.c b/src/daycare.c
index b383667a7..591b5b188 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -114,17 +114,17 @@ static void Daycare_SendPokemon(struct Pokemon * mon, struct DayCareData * dayca
 
     empty_slot = Daycare_FindEmptySpot(daycare_data->mons);
     if(MonHasMail(mon)) {
-        StringCopy((names = daycare_data->mail.data[empty_slot].names), gSaveBlock2.playerName);
+        StringCopy((names = daycare_data->misc.mail[empty_slot].names), gSaveBlock2.playerName);
         PadNameString(names, 0xFC);
         names += 8;
         GetMonNick(mon, names);
         mail = GetMonData(mon, MON_DATA_MAIL);
-        daycare_data->mail.data[empty_slot].mail = gSaveBlock1.mail[mail];
+        daycare_data->misc.mail[empty_slot].message = gSaveBlock1.mail[mail];
         TakeMailFromMon(mon);
     }
     daycare_data->mons[empty_slot] = mon->box;
     BoxMonRestorePP(&daycare_data->mons[empty_slot]);
-    daycare_data->mail.egg.steps[empty_slot] = 0;
+    daycare_data->misc.countersEtc.steps[empty_slot] = 0;
     ZeroMonData(mon);
     party_compaction();
     CalculatePlayerPartyCount();
@@ -141,10 +141,10 @@ static void sub_80414C0(struct DayCareData * daycare_data)
     {
         daycare_data->mons[0] = daycare_data->mons[1];
         ZeroBoxMonData(&daycare_data->mons[1]);
-        daycare_data->mail.data[0] = daycare_data->mail.data[1];
-        daycare_data->mail.egg.steps[0] = daycare_data->mail.egg.steps[1];
-        daycare_data->mail.egg.steps[1] = 0;
-        sub_80417F4(&daycare_data->mail.data[1]);
+        daycare_data->misc.mail[0] = daycare_data->misc.mail[1];
+        daycare_data->misc.countersEtc.steps[0] = daycare_data->misc.countersEtc.steps[1];
+        daycare_data->misc.countersEtc.steps[1] = 0;
+        sub_80417F4(&daycare_data->misc.mail[1]);
     }
 }
 
@@ -157,7 +157,7 @@ static void DayCare_LevelUpMoves(struct Pokemon * mon)
     u8 r6;
     u16 temp;
 
-    for (i = 0; i < 100; i++)
+    for (i = 0; i < MAX_LEVEL; i++)
     {
         if (TryIncrementMonLevel(mon))
         {
@@ -187,19 +187,19 @@ static u16 sub_8041570(struct DayCareData * daycare_data, u8 slot)
     sub_803B4B4(&daycare_data->mons[slot], &pokemon);
     if (GetMonData(&pokemon, MON_DATA_LEVEL) != MAX_LEVEL)
     {
-        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->mail.egg.steps[slot];
+        experience = GetMonData(&pokemon, MON_DATA_EXP) + daycare_data->misc.countersEtc.steps[slot];
         SetMonData(&pokemon, MON_DATA_EXP, (u8 *)&experience);
         DayCare_LevelUpMoves(&pokemon);
     }
     gPlayerParty[PARTY_SIZE - 1] = pokemon;
-    if (daycare_data->mail.data[slot].mail.itemId)
+    if (daycare_data->misc.mail[slot].message.itemId)
     {
-        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->mail.data[slot].mail);
-        sub_80417F4(&daycare_data->mail.data[slot]);
+        GiveMailToMon2(&gPlayerParty[PARTY_SIZE - 1], &daycare_data->misc.mail[slot].message);
+        sub_80417F4(&daycare_data->misc.mail[slot]);
     }
     party_compaction();
     ZeroBoxMonData(&daycare_data->mons[slot]);
-    daycare_data->mail.egg.steps[slot] = 0;
+    daycare_data->misc.countersEtc.steps[slot] = 0;
     sub_80414C0(daycare_data);
     CalculatePlayerPartyCount();
     return species;
@@ -223,7 +223,7 @@ static u8 sub_80416A0(struct DayCareData *daycareData, u8 slot)
     u8 levelAfter;
 
     levelBefore = GetLevelFromBoxMonExp(&daycareData->mons[slot]);
-    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->mail.egg.steps[slot]);
+    levelAfter = Daycare_GetLevelAfterSteps(&daycareData->mons[slot], daycareData->misc.countersEtc.steps[slot]);
     return levelAfter - levelBefore;
 }
 
@@ -253,8 +253,8 @@ void sub_8041770(void)
 
 void sub_8041790(u16 i)
 {
-    gSaveBlock1.daycareData.mail.egg.steps[0] += i;
-    gSaveBlock1.daycareData.mail.egg.steps[1] += i;
+    gSaveBlock1.daycareData.misc.countersEtc.steps[0] += i;
+    gSaveBlock1.daycareData.misc.countersEtc.steps[1] += i;
 }
 
 u8 sub_80417B8(void)
@@ -277,7 +277,7 @@ static void sub_80417F4(struct DayCareMail *mail)
     zero = 0;
     names = mail->names + 18;
     do *names-- = zero; while ((int)names >= (int)names2);
-    ClearMailStruct(&mail->mail);
+    ClearMailStruct(&mail->message);
 }
 
 void unref_sub_8041824(struct DayCareData *dayCareData)
@@ -286,11 +286,11 @@ void unref_sub_8041824(struct DayCareData *dayCareData)
     for (slot = 0; slot < ARRAY_COUNT(dayCareData->mons); slot ++)
     {
         ZeroBoxMonData(&dayCareData->mons[slot]);
-        dayCareData->mail.egg.steps[slot] = 0;
-        sub_80417F4(&dayCareData->mail.data[slot]);
+        dayCareData->misc.countersEtc.steps[slot] = 0;
+        sub_80417F4(&dayCareData->misc.mail[slot]);
     }
-    dayCareData->mail.egg.personalityLo = 0;
-    dayCareData->mail.egg.unk_11a = 0;
+    dayCareData->misc.countersEtc.personalityLo = 0;
+    dayCareData->misc.countersEtc.unk_11a = 0;
 }
 
 u16 sub_8041870(u16 species)
@@ -322,13 +322,13 @@ u16 sub_8041870(u16 species)
 
 static void sub_80418F0(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = (Random() % 0xfffe) + 1;
+    dayCareData->misc.countersEtc.personalityLo = (Random() % 0xfffe) + 1;
     FlagSet(0x86);
 }
 
 static void sub_804191C(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = Random() | 0x8000;
+    dayCareData->misc.countersEtc.personalityLo = Random() | 0x8000;
     FlagSet(0x86);
 }
 
@@ -864,8 +864,8 @@ void daycare_build_child_moveset(struct Pokemon *egg, struct BoxPokemon *dad, st
 
 static void RemoveEggFromDayCare(struct DayCareData *dayCareData)
 {
-    dayCareData->mail.egg.personalityLo = 0;
-    dayCareData->mail.egg.unk_11a = 0;
+    dayCareData->misc.countersEtc.personalityLo = 0;
+    dayCareData->misc.countersEtc.unk_11a = 0;
 }
 
 void sub_8041E7C(void)
@@ -912,11 +912,11 @@ static u16 sub_8041EEC(struct DayCareData *dayCareData, u8 *a1) // inherit_speci
         }
     }
     eggSpecies = sub_8041870(species[a1[0]]);
-    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->mail.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_NIDORAN_F && dayCareData->misc.countersEtc.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_NIDORAN_M;
     }
-    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->mail.egg.personalityLo & 0x8000)
+    if (eggSpecies == SPECIES_ILLUMISE && dayCareData->misc.countersEtc.personalityLo & 0x8000)
     {
         eggSpecies = SPECIES_VOLBEAT;
     }
@@ -980,7 +980,7 @@ static void sub_80420FC(struct Pokemon *mon, u16 species, struct DayCareData *da
     u16 ball;
     u8 metLevel;
     u8 language;
-    personality = dayCareData->mail.egg.personalityLo | (Random() << 16);
+    personality = dayCareData->misc.countersEtc.personalityLo | (Random() << 16);
     CreateMon(mon, species, 5, 0x20, TRUE, personality, FALSE, 0);
     metLevel = 0;
     ball = ITEM_POKE_BALL;
@@ -1009,15 +1009,15 @@ static bool8 sub_80421B0(struct DayCareData *dayCareData)
     {
         if (GetBoxMonData(parent, MON_DATA_SANITY_BIT2, v0))
         {
-            dayCareData->mail.egg.steps[i]++;
+            dayCareData->misc.countersEtc.steps[i]++;
             v0++;
         }
     }
-    if (dayCareData->mail.egg.personalityLo == 0 && v0 == 2 && dayCareData->mail.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
+    if (dayCareData->misc.countersEtc.personalityLo == 0 && v0 == 2 && dayCareData->misc.extra.misc[4] == 0xff && daycare_relationship_score(dayCareData) > (u32)((u32)(Random() * 100) / 0xffff))
     {
         sub_8041940();
     }
-    if ((++dayCareData->mail.egg.unk_11a) == 0xff)
+    if ((++dayCareData->misc.countersEtc.unk_11a) == 0xff)
     {
         for (i=0; i<gPlayerPartyCount; i++)
         {
@@ -1168,7 +1168,7 @@ bool8 sub_80422A0(void)
 
 static bool8 sub_80422B4(struct DayCareData *dayCareData)
 {
-    return (u32)((-dayCareData->mail.egg.personalityLo) | dayCareData->mail.egg.personalityLo) >> 31;
+    return (u32)((-dayCareData->misc.countersEtc.personalityLo) | dayCareData->misc.countersEtc.personalityLo) >> 31;
 }
 
 static void sub_80422C4(struct DayCareData *dayCareData)
@@ -1618,7 +1618,7 @@ static void DaycareLevelMenuGetLevelText(struct DayCareData *dayCareData, u8 *de
     *dest = EOS;
     for (i = 0; i < 2; i ++)
     {
-        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->mail.egg.steps[i]);
+        level = Daycare_GetLevelAfterSteps(&dayCareData->mons[i], dayCareData->misc.countersEtc.steps[i]);
         dest[0] = 0x34;
         dest[1] = 0xFC;
         dest[2] = 0x14;
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c
index 62837c8e6..1595ecd2e 100644
--- a/src/mori_debug_menu.c
+++ b/src/mori_debug_menu.c
@@ -117,7 +117,7 @@ s8 MoriDebugMenu_BreedEgg(void)
             SetMonData(&gPlayerParty[loopCounter], MON_DATA_FRIENDSHIP, &friendship);
         }
     }
-    gSaveBlock1.daycareData.mail.egg.unk_11a = -3;
+    gSaveBlock1.daycareData.misc.countersEtc.unk_11a = -3;
     CloseMenu();
     return 1;
 }
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 57c7cff1d..8dff432c1 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -74,8 +74,8 @@ void RecordMixing_PrepareExchangePacket(void)
     memcpy(unk_2018000.filler1004, gUnknown_083D0274, sizeof(unk_2008000.filler1004));
     memcpy(unk_2018000.filler1044, gUnknown_083D0278, sizeof(unk_2008000.filler1044));
     memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, sizeof(unk_2018000.easyChatPairs));
-    gUnknown_02038738.data[0] = gSaveBlock1.daycareData.mail.data[0];
-    gUnknown_02038738.data[1] = gSaveBlock1.daycareData.mail.data[1];
+    gUnknown_02038738.mail[0] = gSaveBlock1.daycareData.misc.mail[0];
+    gUnknown_02038738.mail[1] = gSaveBlock1.daycareData.misc.mail[1];
     sub_8041324(gSaveBlock1.daycareData.mons, &gUnknown_02038738);
     memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixingDayCareMail));
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, sizeof(unk_2018000.filler1124));
@@ -511,7 +511,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     u16 i;  // r3
     u16 r7;
     u8 r1;
-    struct DayCareMailEtc *r6;
+    struct DayCareMisc *r6;
 
     //asm("":::"r8");
     SeedRng(gLinkPlayers[0].trainerId);
@@ -526,7 +526,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     sp3C = 0;
     for (i = 0; i < r8; i++)
     {
-        r6 = (struct DayCareMailEtc *)(a + b * i);
+        r6 = (struct DayCareMisc *)(a + b * i);
         if (r6->unk70 != 0)
         {
             for (r7 = 0; r7 < r6->unk70; r7++)
@@ -540,7 +540,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9D46
     for (r7 = 0, i = 0; i < r8; i++)
     {
-        r6 = (struct DayCareMailEtc *)(a + b * i);
+        r6 = (struct DayCareMisc *)(a + b * i);
         if (sp1C[i][0] == 1 || sp1C[i][1] == 1)
             sp3C++;
         if (sp1C[i][0] == 1 && sp1C[i][1] == 0)
@@ -596,7 +596,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9E3E
     for (i = 0; i < 4; i++)
     {
-        r6 = (struct DayCareMailEtc *)a + b * c;
+        r6 = (struct DayCareMisc *)a + b * c;
         spC[i] = r6;
     }
     r1 = sub_80B9C4C(d) % 3;
@@ -630,7 +630,7 @@ void sub_80B9C6C(u8 *a, u32 b, u8 c, void *d)
     //_080B9EF0
     //memcpy(&gSaveBlock1.filler_303C.data[0], a + b * c, 0x38);
     //memcpy(&gSaveBlock1.filler_303C.data[1], a + b * c + 0x38, 0x38);
-    r6 = (struct DayCareMailEtc *)(a + b * c);
+    r6 = (struct DayCareMisc *)(a + b * c);
     gSaveBlock1.filler_303C.data[0] = r6->data[0];
     gSaveBlock1.filler_303C.data[1] = r6->data[1];
     //memcpy(&gSaveBlock1.filler_303C.data[0], &r6->data[0], 0x38);
-- 
cgit v1.2.3


From 4133688019e167da45c868a26bf6a6e4901bef54 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 29 Sep 2017 22:41:30 -0400
Subject: Lazy remove "Created by" IDE lines

---
 src/decoration_inventory.c | 2 +-
 src/field_tasks.c          | 2 +-
 src/pokeblock.c            | 2 +-
 src/use_pokeblock.c        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index 35ba7e228..083cb260c 100644
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 6/5/17.
+
 //
 
 #include "global.h"
diff --git a/src/field_tasks.c b/src/field_tasks.c
index 2be54f923..68ceb67bc 100644
--- a/src/field_tasks.c
+++ b/src/field_tasks.c
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/22/2017.
+
 //
 
 #include "global.h"
diff --git a/src/pokeblock.c b/src/pokeblock.c
index d69c41639..593d7344b 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -1,5 +1,5 @@
 //
-// Created by scott on 6/27/2017.
+
 //
 
 #include "global.h"
diff --git a/src/use_pokeblock.c b/src/use_pokeblock.c
index be3003680..e946a9cfc 100644
--- a/src/use_pokeblock.c
+++ b/src/use_pokeblock.c
@@ -1,5 +1,5 @@
 //
-// Created by Scott Norton on 5/31/17.
+
 // Modified by Dizzy Egg on 8/15/17.
 //
 
-- 
cgit v1.2.3