Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-30 13:57:40 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Rename daycare special to account for string side effects (#2287)
Some checks are pending
CI / build (push) Waiting to run
Details

Browse Source
This commit is contained in:
FosterProgramming
2026-06-04 13:08:01 +02:00
committed by GitHub
parent b1d9308623
commit 4b6a69ae24
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/scripts/day_care.inc
View File

@@ -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

2
data/specials.inc
View File

@@ -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

2
include/daycare.h
View File

@@ -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);

12
src/daycare.c
View File

@@ -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)