diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-12 01:39:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 01:39:28 -0400 |
| commit | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (patch) | |
| tree | e6977a9d8066e946148b8d1dfcf95e721b59e54f /src/daycare.c | |
| parent | 810ca5f8ff79aeec6ffe8e982f4786aade616b4d (diff) | |
| parent | 876a89eba4903e5ef1ccad22b1ee52023fb24513 (diff) | |
Merge branch 'master' into flatten_sprite_pos
Diffstat (limited to 'src/daycare.c')
| -rw-r--r-- | src/daycare.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/daycare.c b/src/daycare.c index 4199bfda6..6a1715049 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -29,7 +29,7 @@ extern const struct Evolution gEvolutionTable[][EVOS_PER_MON]; static void ClearDaycareMonMail(struct DaycareMail *mail); static void SetInitialEggData(struct Pokemon *mon, u16 species, struct DayCare *daycare); static u8 GetDaycareCompatibilityScore(struct DayCare *daycare); -static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y); +static void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y); // RAM buffers used to assist with BuildEggMoveset() EWRAM_DATA static u16 sHatchedEggLevelUpMoves[EGG_LVL_UP_MOVES_ARRAY_COUNT] = {0}; @@ -1226,7 +1226,7 @@ static void DaycarePrintMonLvl(struct DayCare *daycare, u8 windowId, u32 daycare DaycareAddTextPrinter(windowId, lvlText, x, y); } -static void DaycarePrintMonInfo(u8 windowId, s32 daycareSlotId, u8 y) +static void DaycarePrintMonInfo(u8 windowId, u32 daycareSlotId, u8 y) { if (daycareSlotId < (unsigned) DAYCARE_MON_COUNT) { |