diff options
| author | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
|---|---|---|
| committer | KDSKardabox <bollygame94@gmail.com> | 2018-12-09 13:44:41 +0530 |
| commit | 8712757d2454a8ee15680a658ea7df8621954bef (patch) | |
| tree | 5f0ebfdccc0e22c0e52f8d223ec4889c7597569f /src/daycare.c | |
| parent | f8838491f6c46df771c5414f8b6da781294300b7 (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/daycare.c')
| -rw-r--r-- | src/daycare.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/daycare.c b/src/daycare.c index 21678adc0..131540f6e 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -532,7 +532,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) s32 i, j; u8 temp[NUM_STATS]; - ivs[selectedIv] = 0xff; + ivs[selectedIv] = 0xFF; for (i = 0; i < NUM_STATS; i++) { temp[i] = ivs[i]; @@ -541,7 +541,7 @@ static void RemoveIVIndexFromList(u8 *ivs, u8 selectedIv) j = 0; for (i = 0; i < NUM_STATS; i++) { - if (temp[i] != 0xff) + if (temp[i] != 0xFF) ivs[j++] = temp[i]; } } @@ -681,7 +681,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == sHatchedEggEggMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); break; } @@ -700,7 +700,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggFatherMoves[i] == ItemIdToBattleMoveId(ITEM_TM01_FOCUS_PUNCH + j) && CanMonLearnTMHM(egg, j)) { - if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFatherMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFatherMoves[i]); } } @@ -725,7 +725,7 @@ static void BuildEggMoveset(struct Pokemon *egg, struct BoxPokemon *father, stru { if (sHatchedEggLevelUpMoves[j] != MOVE_NONE && sHatchedEggFinalMoves[i] == sHatchedEggLevelUpMoves[j]) { - if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xffff) + if (GiveMoveToMon(egg, sHatchedEggFinalMoves[i]) == 0xFFFF) DeleteFirstMoveAndGiveMoveToMon(egg, sHatchedEggFinalMoves[i]); break; } |