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/battle_controller_player.c | |
| parent | 405f1bb529809b8169364737087189df0fcca1d2 (diff) | |
Remove uses of INVALID_ defines, clean up some arrays with constants, and spaces -> tabs
Diffstat (limited to 'src/battle_controller_player.c')
| -rw-r--r-- | src/battle_controller_player.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 3053e6c37..2bd5ef365 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -635,7 +635,7 @@ u32 sub_8057FBC(void) // unused PlaySE(SE_SELECT); gBattle_BG0_X = 0; gBattle_BG0_Y = 0x140; - var = INVALID_U8; + var = 0xFF; } if (gMain.newKeys & DPAD_LEFT && gMoveSelectionCursor[gActiveBattler] & 1) { @@ -936,7 +936,7 @@ static void sub_80588B4(void) static void sub_8058924(void) { - if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == INVALID_U8) + if (--gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 == 0xFF) { gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].field_9 = 0; PlayerBufferExecCompleted(); @@ -1119,7 +1119,7 @@ static void CompleteOnHealthbarDone(void) SetHealthboxSpriteVisible(gHealthboxSpriteIds[gActiveBattler]); - if (hpValue != INVALID_S16) + if (hpValue != -1) { UpdateHpTextInHealthbox(gHealthboxSpriteIds[gActiveBattler], hpValue, HP_CURRENT); } @@ -1221,7 +1221,7 @@ static void sub_8059400(u8 taskId) newExpPoints = MoveBattleBar(battlerId, gHealthboxSpriteIds[battlerId], EXP_BAR, 0); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battlerId]); - if (newExpPoints == INVALID_S16) // The bar has been filled with given exp points. + if (newExpPoints == -1) // The bar has been filled with given exp points. { u8 level; s32 currExp; |