From f25a1e6106fef11318301666359ee5ec2d45677f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 29 Aug 2017 22:14:29 -0400 Subject: Daycare_SendPokemon --- src/mori_debug_menu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/mori_debug_menu.c') 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; } -- cgit v1.2.3 From 2286c4306f67a091e48eac724536e7853117f0e0 Mon Sep 17 00:00:00 2001 From: scnorton 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/mori_debug_menu.c') 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 e8d49bf6287142fcb463f416bb7edfd62c053959 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 30 Aug 2017 18:29:31 -0400 Subject: Make static what of the remainder should be static --- src/mori_debug_menu.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/mori_debug_menu.c') 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 Date: Wed, 30 Aug 2017 19:04:07 -0400 Subject: Fix building --- src/mori_debug_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mori_debug_menu.c') 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; } -- cgit v1.2.3 From 9f736e58afff3e3e3be1398ceebac93614ec70e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 29 Sep 2017 22:25:20 -0400 Subject: Rename daycare structs to be slightly less insensible --- src/mori_debug_menu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/mori_debug_menu.c') 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; } -- cgit v1.2.3