diff options
| author | Evan <eroelke@gmail.com> | 2019-12-04 07:53:12 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 07:53:12 -0700 |
| commit | 11a52655f307788f042e34c1bcf345d2b2de61b8 (patch) | |
| tree | 2858cca9f0cec5a222fbb3a35fbac152b6eb3d59 /src | |
| parent | 2dacf6c1bf329ff7321bf52e3591b5920c281b5d (diff) | |
text fixes
Diffstat (limited to 'src')
| -rw-r--r-- | src/pokeball.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pokeball.c b/src/pokeball.c index 395150a2e..aeaba08ab 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -331,7 +331,7 @@ u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow) u8 taskId; gDoingBattleAnim = TRUE; - gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = 1; + gBattleSpritesDataPtr->healthBoxesData[gActiveBattler].ballAnimActive = TRUE; taskId = CreateTask(Task_DoPokeballSendOutAnim, 5); gTasks[taskId].tPan = pan; gTasks[taskId].tThrowId = kindOfThrow; @@ -854,13 +854,13 @@ static void HandleBallAnimEnd(struct Sprite *sprite) gSprites[gBattlerSpriteIds[battlerId]].pos2.y = 0; gDoingBattleAnim = FALSE; - gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE; FreeSpriteOamMatrix(sprite); DestroySprite(sprite); for (doneBattlers = 0, i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive == 0) + if (!gBattleSpritesDataPtr->healthBoxesData[i].ballAnimActive) doneBattlers++; } if (doneBattlers == MAX_BATTLERS_COUNT) @@ -892,7 +892,7 @@ static void sub_804B5C8(struct Sprite *sprite) DestroySprite(&gSprites[gBattlerSpriteIds[sprite->sBattler]]); DestroySpriteAndFreeResources(sprite); if (gMain.inBattle) - gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = 0; + gBattleSpritesDataPtr->healthBoxesData[battlerId].ballAnimActive = FALSE; } } @@ -1240,7 +1240,7 @@ void LoadBallGfx(u8 ballId) { u16 var; - if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == 0xFFFF) + if (GetSpriteTileStartByTag(gBallSpriteSheets[ballId].tag) == SPRITE_INVALID_TAG) { LoadCompressedSpriteSheetUsingHeap(&gBallSpriteSheets[ballId]); LoadCompressedSpritePaletteUsingHeap(&gBallSpritePalettes[ballId]); |