diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-09-29 19:45:56 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 19:45:56 -0700 |
| commit | cf0bf8a1f2d3cd97e0fe967270188dda24b8fac2 (patch) | |
| tree | f830e2568cdd61baa849ad860ee875093d3095af /src/mori_debug_menu.c | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
| parent | 4133688019e167da45c868a26bf6a6e4901bef54 (diff) | |
Merge pull request #426 from PikalaxALT/daycare
Decompile asm/daycare.s
Diffstat (limited to 'src/mori_debug_menu.c')
| -rw-r--r-- | src/mori_debug_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mori_debug_menu.c b/src/mori_debug_menu.c index 4eadaa78b..1595ecd2e 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) == 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) == 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.filler_30B6 = -3; + gSaveBlock1.daycareData.misc.countersEtc.unk_11a = -3; CloseMenu(); return 1; } |