diff options
| author | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-05 22:31:01 +0800 |
|---|---|---|
| committer | nullableVoidPtr <30564701+nullableVoidPtr@users.noreply.github.com> | 2018-12-06 10:38:28 +0800 |
| commit | f9ff7316d5c7277eb7482e30121388cd65f4ecfc (patch) | |
| tree | ee8f4a9c338f880a3585d6e9ed9ed695f27cef3d /src/learn_move.c | |
| parent | 405f1bb529809b8169364737087189df0fcca1d2 (diff) | |
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/learn_move.c')
| -rw-r--r-- | src/learn_move.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/learn_move.c b/src/learn_move.c index cb8bb66ff..4e02cedd3 100644 --- a/src/learn_move.c +++ b/src/learn_move.c @@ -381,7 +381,7 @@ static void LearnMoveMain(void) if (selection == 0) { - if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != INVALID_U16) + if (GiveMoveToMon(&gPlayerParty[sLearnMoveStruct->partyMon], GetCurrentItemId()) != 0xFFFF) { sub_816084C(gText_PkmnLearnedMove4); gSpecialVar_0x8004 = 1; @@ -727,12 +727,12 @@ static void CreateHearts(void) static void AddScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 == 0xFF) { sLearnMoveStruct->scrollArrowTaskId2 = AddScrollIndicatorArrowPair(&gUnknown_085CEBC0, &sLearnMoveStruct->scrollOffset); } - if (sLearnMoveStruct->scrollArrowTaskId1 == INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 == 0xFF) { gTempScrollArrowTemplate = gUnknown_085CEBD0; gTempScrollArrowTemplate.fullyDownThreshold = sLearnMoveStruct->numMenuChoices - sLearnMoveStruct->numToShowAtOnce; @@ -742,16 +742,16 @@ static void AddScrollArrows(void) static void RemoveScrollArrows(void) { - if (sLearnMoveStruct->scrollArrowTaskId2 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId2 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId2); - sLearnMoveStruct->scrollArrowTaskId2 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId2 = 0xFF; } - if (sLearnMoveStruct->scrollArrowTaskId1 != INVALID_U8) + if (sLearnMoveStruct->scrollArrowTaskId1 != 0xFF) { RemoveScrollIndicatorArrowPair(sLearnMoveStruct->scrollArrowTaskId1); - sLearnMoveStruct->scrollArrowTaskId1 = INVALID_U8; + sLearnMoveStruct->scrollArrowTaskId1 = 0xFF; } } @@ -792,7 +792,7 @@ void ShowHideHearts(s32 item) { numHearts = (u8)(gContestEffects[gContestMoves[item].effect].appeal / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } @@ -812,7 +812,7 @@ void ShowHideHearts(s32 item) numHearts = (u8)(gContestEffects[gContestMoves[item].effect].jam / 10); - if (numHearts == INVALID_U8) + if (numHearts == 0xFF) { numHearts = 0; } |