diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 9d49514fb4..13b940ca74 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -170,7 +170,7 @@ Route117_PokemonDayCare_EventScript_TryRetrieveMon:: end Route117_PokemonDayCare_EventScript_CostPrompt:: - special GetDaycareCost + special GetDaycareCostAndPrepareString msgbox Route117_PokemonDayCare_Text_ItWillCostX, MSGBOX_YESNO goto_if_eq VAR_RESULT, YES, Route117_PokemonDayCare_EventScript_CheckEnoughMoney goto Route117_PokemonDayCare_EventScript_ComeAgain diff --git a/data/specials.inc b/data/specials.inc index ff4fae1f49..34f27bfcfd 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -207,7 +207,7 @@ gSpecials:: def_special ChooseSendDaycareMon, waitstate=1 def_special ShowDaycareLevelMenu, waitstate=1 def_special GetNumLevelsGainedFromDaycare - def_special GetDaycareCost + def_special GetDaycareCostAndPrepareString def_special TakePokemonFromDaycare def_special ScriptHatchMon def_special EggHatch, waitstate=1 diff --git a/include/daycare.h b/include/daycare.h index 62a7918ff3..bc4004a7b6 100644 --- a/include/daycare.h +++ b/include/daycare.h @@ -16,7 +16,7 @@ u8 CountPokemonInDaycare(struct DayCare *daycare); void InitDaycareMailRecordMixing(struct DayCare *daycare, struct RecordMixingDaycareMail *mixMail); void StoreSelectedPokemonInDaycare(void); u16 TakePokemonFromDaycare(void); -void GetDaycareCost(void); +void GetDaycareCostAndPrepareString(void); u8 GetNumLevelsGainedFromDaycare(void); void TriggerPendingDaycareEgg(void); void RejectEggFromDayCare(void); diff --git a/src/daycare.c b/src/daycare.c index eb9a5fdeb0..ef4eaabb53 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -51,7 +51,7 @@ static const struct WindowTemplate sDaycareLevelMenuWindowTemplate = }; // Indices here are assigned by Task_HandleDaycareLevelMenuInput to VAR_RESULT, -// which is copied to VAR_0x8004 and used as an index for GetDaycareCost +// which is copied to VAR_0x8004 and used as an index for GetDaycareCostAndPrepareString static const struct ListMenuItem sLevelMenuItems[] = { {gText_ExpandedPlaceholder_Empty, 0}, @@ -310,7 +310,7 @@ static u8 GetNumLevelsGainedForDaycareMon(struct DaycareMon *daycareMon) return numLevelsGained; } -static u32 GetDaycareCostForSelectedMon(struct DaycareMon *daycareMon) +static u32 PrepareDaycareCostStringForSelectedMon(struct DaycareMon *daycareMon) { u32 cost; @@ -321,14 +321,14 @@ static u32 GetDaycareCostForSelectedMon(struct DaycareMon *daycareMon) return cost; } -static u16 GetDaycareCostForMon(struct DayCare *daycare, u8 slotId) +static u16 PrepareDaycareCostStringForMon(struct DayCare *daycare, u8 slotId) { - return GetDaycareCostForSelectedMon(&daycare->mons[slotId]); + return PrepareDaycareCostStringForSelectedMon(&daycare->mons[slotId]); } -void GetDaycareCost(void) +void GetDaycareCostAndPrepareString(void) { - gSpecialVar_0x8005 = GetDaycareCostForMon(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004); + gSpecialVar_0x8005 = PrepareDaycareCostStringForMon(&gSaveBlock1Ptr->daycare, gSpecialVar_0x8004); } static void UNUSED Debug_AddDaycareSteps(u16 numSteps)