Cleaned trailing whitespace
This commit is contained in:
+5
-5
@@ -1848,7 +1848,7 @@ static const u8 sMonAnimationDelayTable[NUM_SPECIES - 1] =
|
||||
#define PP_UP_SHIFTS_INV(val) (u8)~(val), (u8)~((val) << 2), (u8)~((val) << 4), (u8)~((val) << 6)
|
||||
|
||||
// PP Up bonuses are stored for a Pokémon as a single byte.
|
||||
// There are 2 bits (a value 0-3) for each move slot that
|
||||
// There are 2 bits (a value 0-3) for each move slot that
|
||||
// represent how many PP Ups have been applied.
|
||||
// The following arrays take a move slot id and return:
|
||||
// gPPUpGetMask - A mask to get the number of PP Ups applied to that move slot
|
||||
@@ -3119,7 +3119,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de
|
||||
spAttack = attacker->spAttack;
|
||||
spDefense = defender->spDefense;
|
||||
|
||||
// Get attacker hold item info
|
||||
// Get attacker hold item info
|
||||
if (attacker->item == ITEM_ENIGMA_BERRY)
|
||||
{
|
||||
attackerHoldEffect = gEnigmaBerries[battlerIdAtk].holdEffect;
|
||||
@@ -5204,7 +5204,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov
|
||||
case 4: // ITEM5_PP_MAX
|
||||
dataUnsigned = (GetMonData(mon, MON_DATA_PP_BONUSES, NULL) & gPPUpGetMask[moveIndex]) >> (moveIndex * 2);
|
||||
temp2 = CalculatePPWithBonus(GetMonData(mon, MON_DATA_MOVE1 + moveIndex, NULL), GetMonData(mon, MON_DATA_PP_BONUSES, NULL), moveIndex);
|
||||
|
||||
|
||||
// Check if 3 PP Ups have been applied already, and that the move has a total PP of at least 5 (excludes Sketch)
|
||||
if (dataUnsigned < 3 && temp2 >= 5)
|
||||
{
|
||||
@@ -6918,7 +6918,7 @@ static bool8 ShouldSkipFriendshipChange(void)
|
||||
// Only the 'default' mode (MON_SPR_GFX_MODE_NORMAL) is used, which is set
|
||||
// up to allocate 4 sprites using the battler sprite templates (gBattlerSpriteTemplates).
|
||||
// MON_SPR_GFX_MODE_BATTLE is identical but never used.
|
||||
// MON_SPR_GFX_MODE_FULL_PARTY is set up to allocate 7 sprites (party + trainer?)
|
||||
// MON_SPR_GFX_MODE_FULL_PARTY is set up to allocate 7 sprites (party + trainer?)
|
||||
// using a generic 64x64 template, and is also never used.
|
||||
|
||||
// Between the unnecessarily large sizes below, a mistake allocating the spritePointers
|
||||
@@ -6980,7 +6980,7 @@ struct MonSpritesGfxManager *CreateMonSpritesGfxManager(u8 managerId, u8 mode)
|
||||
gfx->dataSize = 1;
|
||||
gfx->mode = MON_SPR_GFX_MODE_FULL_PARTY;
|
||||
break;
|
||||
// case MON_SPR_GFX_MODE_BATTLE:
|
||||
// case MON_SPR_GFX_MODE_BATTLE:
|
||||
case MON_SPR_GFX_MODE_NORMAL:
|
||||
default:
|
||||
gfx->numSprites = MAX_BATTLERS_COUNT;
|
||||
|
||||
Reference in New Issue
Block a user