Make static what of the remainder should be static

2 files changed, 19 insertions, 16 deletions

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;
 }