From 13071f701950a411b8af13e0a66283cab018312c Mon Sep 17 00:00:00 2001 From: Eduardo Quezada Date: Mon, 12 May 2025 13:53:15 -0400 Subject: [PATCH] Added `IsOnPlayerSide` --- docs/tutorials/how_to_new_trainer_slide.md | 2 +- include/battle.h | 7 +- src/battle_ai_main.c | 6 +- src/battle_ai_switch_items.c | 4 +- src/battle_ai_util.c | 2 +- src/battle_anim.c | 18 ++-- src/battle_anim_bug.c | 14 +-- src/battle_anim_dark.c | 4 +- src/battle_anim_dragon.c | 12 +-- src/battle_anim_effects_1.c | 92 +++++++++--------- src/battle_anim_effects_2.c | 44 ++++----- src/battle_anim_effects_3.c | 74 +++++++-------- src/battle_anim_electric.c | 18 ++-- src/battle_anim_fight.c | 14 +-- src/battle_anim_fire.c | 16 ++-- src/battle_anim_flying.c | 14 +-- src/battle_anim_ghost.c | 10 +- src/battle_anim_ground.c | 2 +- src/battle_anim_ice.c | 30 +++--- src/battle_anim_mon_movement.c | 30 +++--- src/battle_anim_mons.c | 36 +++---- src/battle_anim_new.c | 32 +++---- src/battle_anim_normal.c | 4 +- src/battle_anim_poison.c | 8 +- src/battle_anim_psychic.c | 16 ++-- src/battle_anim_rock.c | 10 +- src/battle_anim_throw.c | 8 +- src/battle_anim_utility_funcs.c | 2 +- src/battle_anim_water.c | 20 ++-- src/battle_controller_player.c | 8 +- src/battle_controller_safari.c | 2 +- src/battle_controller_wally.c | 2 +- src/battle_controllers.c | 52 +++++----- src/battle_debug.c | 4 +- src/battle_dynamax.c | 2 +- src/battle_end_turn.c | 6 +- src/battle_gfx_sfx_util.c | 14 +-- src/battle_gimmick.c | 4 +- src/battle_interface.c | 32 +++---- src/battle_main.c | 11 +-- src/battle_message.c | 46 ++++----- src/battle_script_commands.c | 105 ++++++++++----------- src/battle_terastal.c | 8 +- src/battle_tv.c | 2 +- src/battle_util.c | 49 +++++----- src/battle_util2.c | 2 +- src/party_menu.c | 6 +- src/pokeball.c | 6 +- src/pokemon.c | 10 +- src/recorded_battle.c | 4 +- src/reshow_battle_screen.c | 8 +- src/trainer_slide.c | 12 +-- 52 files changed, 470 insertions(+), 474 deletions(-) diff --git a/docs/tutorials/how_to_new_trainer_slide.md b/docs/tutorials/how_to_new_trainer_slide.md index 67c29a437d..49c3e80f3e 100644 --- a/docs/tutorials/how_to_new_trainer_slide.md +++ b/docs/tutorials/how_to_new_trainer_slide.md @@ -118,7 +118,7 @@ The function that determines if a Slide should play has different function for m + if (IsSlideInitalizedOrPlayed(slideId)) + return; + -+ if (GetBattlerSide(target) == B_SIDE_OPPONENT) ++ if (!IsOnPlayerSide(target)) + return; + + InitalizeTrainerSlide(slideId); diff --git a/include/battle.h b/include/battle.h index 5e87b61297..ed66b2555b 100644 --- a/include/battle.h +++ b/include/battle.h @@ -1196,6 +1196,11 @@ static inline u32 GetBattlerSide(u32 battler) return GetBattlerPosition(battler) & BIT_SIDE; } +static inline u32 IsOnPlayerSide(u32 battler) +{ + return (GetBattlerSide(battler) == B_SIDE_PLAYER); +} + static inline bool32 IsBattlerAlly(u32 battlerAtk, u32 battlerDef) { return (GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef)); @@ -1209,7 +1214,7 @@ static inline u32 GetOpposingSideBattler(u32 battler) static inline struct Pokemon* GetBattlerMon(u32 battler) { u32 index = gBattlerPartyIndexes[battler]; - return (GetBattlerSide(battler) == B_SIDE_OPPONENT) ? &gEnemyParty[index] : &gPlayerParty[index]; + return (!IsOnPlayerSide(battler)) ? &gEnemyParty[index] : &gPlayerParty[index]; } static inline struct Pokemon *GetSideParty(u32 side) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index f1f8e4de80..5aabed773c 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -3825,7 +3825,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) //todo - check z splash, z celebrate, z happy hour (lol) break; case EFFECT_TELEPORT: // Either remove or add better logic - if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) || GetBattlerSide(battlerAtk) != B_SIDE_PLAYER) + if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) || !IsOnPlayerSide(battlerAtk)) break; //fallthrough case EFFECT_HIT_ESCAPE: @@ -4903,7 +4903,7 @@ static u32 AI_CalcMoveEffectScore(u32 battlerAtk, u32 battlerDef, u32 move) if (B_TRAINERS_KNOCK_OFF_ITEMS == TRUE) canSteal = TRUE; - if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER || GetBattlerSide(battlerAtk) == B_SIDE_PLAYER) + if (gBattleTypeFlags & BATTLE_TYPE_FRONTIER || IsOnPlayerSide(battlerAtk)) canSteal = TRUE; if (canSteal && aiData->items[battlerAtk] == ITEM_NONE @@ -5727,7 +5727,7 @@ static s32 AI_PredictSwitch(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) static s32 AI_CheckPpStall(u32 battlerAtk, u32 battlerDef, u32 move, s32 score) { - if (GetBattlerSide(battlerAtk) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battlerAtk)) score -= PpStallReduction(move, battlerAtk); return score; } diff --git a/src/battle_ai_switch_items.c b/src/battle_ai_switch_items.c index 7b91f3a344..4addd87960 100644 --- a/src/battle_ai_switch_items.c +++ b/src/battle_ai_switch_items.c @@ -2470,7 +2470,7 @@ static bool32 AI_ShouldHeal(u32 battler, u32 healAmount) //calculate max expected damage from the opponent for (opponent = 0; opponent < gBattlersCount; opponent++) { - if (GetBattlerSide(opponent) == B_SIDE_PLAYER) + if (IsOnPlayerSide(opponent)) { dmg = GetBestDmgFromBattler(opponent, battler, AI_DEFENDING); @@ -2500,7 +2500,7 @@ static bool32 AI_OpponentCanFaintAiWithMod(u32 battler, u32 healAmount) // Check special cases to NOT heal for (i = 0; i < gBattlersCount; i++) { - if (GetBattlerSide(i) == B_SIDE_PLAYER && CanTargetFaintAiWithMod(i, battler, healAmount, 0)) + if (IsOnPlayerSide(i) && CanTargetFaintAiWithMod(i, battler, healAmount, 0)) { // Target is expected to faint us return TRUE; diff --git a/src/battle_ai_util.c b/src/battle_ai_util.c index 2e69b8ee36..44e19d4912 100644 --- a/src/battle_ai_util.c +++ b/src/battle_ai_util.c @@ -3086,7 +3086,7 @@ bool32 CanKnockOffItem(u32 battler, u32 item) | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_SECRET_BASE | (B_TRAINERS_KNOCK_OFF_ITEMS == TRUE ? BATTLE_TYPE_TRAINER : 0) - )) && GetBattlerSide(battler) == B_SIDE_PLAYER) + )) && IsOnPlayerSide(battler)) return FALSE; if (AI_DATA->abilities[battler] == ABILITY_STICKY_HOLD) diff --git a/src/battle_anim.c b/src/battle_anim.c index a860ac93cc..b8118313dd 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1517,7 +1517,7 @@ static void Cmd_fadetobgfromset(void) if (IsContest()) gTasks[taskId].tBackgroundId = bg3; - else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(gBattleAnimTarget)) gTasks[taskId].tBackgroundId = bg2; else gTasks[taskId].tBackgroundId = bg1; @@ -1644,7 +1644,7 @@ s8 BattleAnimAdjustPanning(s8 pan) { if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) pan = SOUND_PAN_TARGET; else pan = SOUND_PAN_ATTACKER; @@ -1654,9 +1654,9 @@ s8 BattleAnimAdjustPanning(s8 pan) if (gBattleAnimAttacker != gBattleAnimTarget || gBattleAnimAttacker != 2 || pan != SOUND_PAN_TARGET) pan *= -1; } - else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(gBattleAnimAttacker)) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { if (pan == SOUND_PAN_TARGET) pan = SOUND_PAN_ATTACKER; @@ -1664,7 +1664,7 @@ s8 BattleAnimAdjustPanning(s8 pan) pan *= -1; } } - else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) + else if (!IsOnPlayerSide(gBattleAnimTarget)) { if (pan == SOUND_PAN_ATTACKER) pan = SOUND_PAN_TARGET; @@ -1686,14 +1686,14 @@ s8 BattleAnimAdjustPanning2(s8 pan) { if (!IsContest() && gBattleSpritesDataPtr->healthBoxesData[gBattleAnimAttacker].statusAnimActive) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) pan = SOUND_PAN_TARGET; else pan = SOUND_PAN_ATTACKER; } else { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) + if (!IsOnPlayerSide(gBattleAnimAttacker) || IsContest()) pan = -pan; } return pan; @@ -2261,7 +2261,7 @@ static void Cmd_createdragondartsprite(void) else template.paletteTag = ANIM_TAG_DREEPY; template.oam = &gOamData_AffineOff_ObjNormal_32x32; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) template.anims = gAnims_DreepyMissileOpponent; else template.anims = gAnims_DreepyMissilePlayer; @@ -2271,7 +2271,7 @@ static void Cmd_createdragondartsprite(void) template.tileTag = ANIM_TAG_AIR_WAVE; template.paletteTag = ANIM_TAG_DREEPY; template.oam = &gOamData_AffineOff_ObjNormal_32x16; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) template.anims = gAnims_DreepyMissileOpponentNotDrag; else template.anims = gAnims_DreepyMissilePlayer; diff --git a/src/battle_anim_bug.c b/src/battle_anim_bug.c index 44b3d20fa9..4dc72e7859 100644 --- a/src/battle_anim_bug.c +++ b/src/battle_anim_bug.c @@ -198,7 +198,7 @@ static void AnimMegahornHorn(struct Sprite *sprite) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } - else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(gBattleAnimTarget)) { StartSpriteAffineAnim(sprite, 1); gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -225,7 +225,7 @@ static void AnimLeechLifeNeedle(struct Sprite *sprite) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; StartSpriteAffineAnim(sprite, 2); } - else if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(gBattleAnimTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -290,13 +290,13 @@ static void AnimTranslateWebThread_Step(struct Sprite *sprite) static void AnimStringWrap(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) sprite->y += 8; sprite->callback = AnimStringWrap_Step; @@ -327,7 +327,7 @@ void AnimSpiderWeb(struct Sprite *sprite) if (gBattleAnimArgs[2]) SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -381,7 +381,7 @@ void AnimTranslateStinger(struct Sprite *sprite) } else { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -426,7 +426,7 @@ void AnimMissileArc(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; diff --git a/src/battle_anim_dark.c b/src/battle_anim_dark.c index fc3afa30a9..12a75efa31 100644 --- a/src/battle_anim_dark.c +++ b/src/battle_anim_dark.c @@ -501,7 +501,7 @@ void AnimTask_MoveAttackerMementoShadow(u8 taskId) task->data[14] = pos - 32; task->data[15] = pos + 32; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) task->data[8] = -12; else task->data[8] = -64; @@ -671,7 +671,7 @@ void AnimTask_MoveTargetMementoShadow(u8 taskId) task->data[14] = x - 4; task->data[15] = x + 4; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) task->data[8] = -12; else task->data[8] = -64; diff --git a/src/battle_anim_dragon.c b/src/battle_anim_dragon.c index bf5c4d823c..79595695e2 100644 --- a/src/battle_anim_dragon.c +++ b/src/battle_anim_dragon.c @@ -335,7 +335,7 @@ const struct SpriteTemplate gDragonPulseSpriteTemplate = // arg 1: initial y pixel offset static void AnimDragonRush(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -363,7 +363,7 @@ static void AnimDragonRush(struct Sprite *sprite) static void AnimDragonRushStep(struct Sprite *sprite) { // These two cases are identical. - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->data[1] += sprite->data[0]; sprite->data[1] &= 0xFF; @@ -406,7 +406,7 @@ void AnimOutrageFlame(struct Sprite *sprite) { sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -432,7 +432,7 @@ static void StartDragonFireTranslation(struct Sprite *sprite) SetSpriteCoordsToAnimAttackerCoords(sprite); sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->data[4] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[1]; sprite->y += gBattleAnimArgs[1]; @@ -478,7 +478,7 @@ void AnimDragonRageFirePlume(struct Sprite *sprite) // For Dragon Breath and Dragon Rage void AnimDragonFireToTarget(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(sprite, 1); StartDragonFireTranslation(sprite); @@ -656,7 +656,7 @@ static void AnimOverheatFlame_Step(struct Sprite *sprite) void AnimDracoMeteorRock(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->data[0] = sprite->x - gBattleAnimArgs[0]; sprite->data[2] = sprite->x - gBattleAnimArgs[2]; diff --git a/src/battle_anim_effects_1.c b/src/battle_anim_effects_1.c index c1b7079c1c..1fe3b7fc0b 100644 --- a/src/battle_anim_effects_1.c +++ b/src/battle_anim_effects_1.c @@ -3129,7 +3129,7 @@ static void AnimGrassKnot(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; @@ -3162,7 +3162,7 @@ static void AnimGrassKnotStep(struct Sprite *sprite) static void AnimWoodHammerBig(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(sprite, 1); TranslateAnimSpriteToTargetMonLocation(sprite); @@ -3173,7 +3173,7 @@ static void AnimWoodHammerSmall(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[5]); AnimateSprite(sprite); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -3199,7 +3199,7 @@ static void AnimWoodHammerSmall(struct Sprite *sprite) static void AnimWoodHammerHammer(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x += HAMMER_X_OFFSET; StartSpriteAffineAnim(sprite, 1); @@ -3231,7 +3231,7 @@ static void AnimWoodHammerHammer_WaitForPunch(struct Sprite *sprite) return; } - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { StartSpriteAffineAnim(sprite, 3); } @@ -3268,7 +3268,7 @@ void AnimMovePowderParticle(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[1] = gBattleAnimArgs[3]; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[3] = -gBattleAnimArgs[4]; } @@ -3427,7 +3427,7 @@ void AnimHyperBeamOrb(struct Sprite *sprite) StartSpriteAnim(sprite, animNum % 8); sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= 20; else sprite->x += 20; @@ -3584,7 +3584,7 @@ static void AnimMoveFeintSwipeStep(struct Sprite *sprite) static void AnimMoveFeintSwipe(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } @@ -3623,7 +3623,7 @@ static void AnimMoveTrumpCardArc(struct Sprite *sprite) static void AnimMoveTrumpCard(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } @@ -3672,7 +3672,7 @@ static void AnimMoveTrumpCardParticleAlive(struct Sprite *sprite) static void AnimMoveTrumpCardParticle(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; } @@ -3771,7 +3771,7 @@ static void AnimMoveWringOut(struct Sprite *sprite) static void AnimLeechSeed(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -3983,7 +3983,7 @@ static void AnimRazorLeafParticle_Step1(struct Sprite *sprite) static void AnimRazorLeafParticle_Step2(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 = -Sin(sprite->data[0], 25); else sprite->x2 = Sin(sprite->data[0], 25); @@ -4106,7 +4106,7 @@ void AnimTeraStarstormStars(struct Sprite *sprite) if (gBattleAnimArgs[5] == 1) { u32 targetPartner; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { if (gBattleAnimTarget == 0) targetPartner = 2; @@ -4158,7 +4158,7 @@ static void AnimTeraStarstormStars_Step(struct Sprite *sprite) void AnimTranslateLinearSingleSineWave(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -4342,7 +4342,7 @@ static void AnimTask_DuplicateAndShrinkToPos_Step1(u8 taskId) u8 spriteId = GetAnimBattlerSpriteId(ANIM_TARGET); gTasks[taskId].data[10] += gTasks[taskId].data[0]; gSprites[spriteId].x2 = gTasks[taskId].data[10] >> 8; - if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimTarget)) gSprites[spriteId].x2 = -gSprites[spriteId].x2; gTasks[taskId].data[11] += 16; @@ -4391,7 +4391,7 @@ void AnimMimicOrb(struct Sprite *sprite) switch (sprite->data[0]) { case 0: - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) gBattleAnimArgs[0] *= -1; sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X) + gBattleAnimArgs[0]; @@ -4615,7 +4615,7 @@ static void AnimKnockOffOpponentsItem(struct Sprite *sprite) static void AnimKnockOffItem(struct Sprite *sprite) { s16 targetY = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y); - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->data[6] = 0; sprite->data[7] = targetY + 10; @@ -4825,7 +4825,7 @@ void AnimTask_LeafBlade(u8 taskId) task->data[7] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); task->data[10] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_WIDTH); task->data[11] = GetBattlerSpriteCoordAttr(gBattleAnimTarget, BATTLER_COORD_ATTR_HEIGHT); - task->data[5] = (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) ? 1 : -1; + task->data[5] = (!IsOnPlayerSide(gBattleAnimTarget)) ? 1 : -1; task->data[9] = 56 - (task->data[5] * 64); task->data[8] = task->data[7] - task->data[9] + task->data[6]; task->data[2] = CreateSprite(&gLeafBladeSpriteTemplate, task->data[8], task->data[9], task->data[4]); @@ -5086,7 +5086,7 @@ static void AnimFlyingParticle(struct Sprite *sprite) else battler = gBattleAnimTarget; - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { sprite->data[4] = 0; sprite->data[2] = gBattleAnimArgs[3]; @@ -5271,7 +5271,7 @@ static void AnimWhipHit_WaitEnd(struct Sprite *sprite) static void AnimSlidingHit(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -5288,7 +5288,7 @@ static void AnimSlidingHit(struct Sprite *sprite) static void AnimWhipHit(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAnim(sprite, 1); sprite->callback = AnimWhipHit_WaitEnd; @@ -5318,7 +5318,7 @@ void AnimCuttingSlice(struct Sprite *sprite) { sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X); sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y); - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) sprite->y += 8; sprite->callback = AnimSlice_Step; @@ -5367,7 +5367,7 @@ static void AnimAirCutterSlice(struct Sprite *sprite) sprite->x = x; sprite->y = y; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) sprite->y += 8; sprite->callback = AnimSlice_Step; @@ -5446,7 +5446,7 @@ static void UNUSED UnusedFlickerAnim(struct Sprite *sprite) static void AnimCirclingMusicNote(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[2]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -5483,7 +5483,7 @@ static void AnimProtect(struct Sprite *sprite) sprite->x = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0]; sprite->y = GetBattlerSpriteCoord2(gBattleAnimAttacker, BATTLER_COORD_Y) + gBattleAnimArgs[1]; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || IsContest()) + if (IsOnPlayerSide(gBattleAnimAttacker) || IsContest()) sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker) + 1; else sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimAttacker); @@ -5705,7 +5705,7 @@ static void AnimSparklingStars(struct Sprite *sprite) static void AnimBubbleBurst(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -5736,7 +5736,7 @@ static void AnimBubbleBurst_Step(struct Sprite *sprite) static void AnimSleepLetterZ(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -5965,7 +5965,7 @@ static void AnimBowMon(struct Sprite *sprite) static void AnimBowMon_Step1(struct Sprite *sprite) { sprite->data[0] = 6; - sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? 2 : -2; + sprite->data[1] = (!IsOnPlayerSide(gBattleAnimAttacker)) ? 2 : -2; sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, AnimBowMon_Step1_Callback); @@ -5978,7 +5978,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite *sprite) { sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; PrepareBattlerSpriteForRotScale(sprite->data[3], ST_OAM_OBJ_NORMAL); - sprite->data[4] = (sprite->data[6] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? 768 : -768; + sprite->data[4] = (sprite->data[6] = !IsOnPlayerSide(gBattleAnimAttacker)) ? 768 : -768; sprite->data[5] = 0; } @@ -5995,7 +5995,7 @@ static void AnimBowMon_Step1_Callback(struct Sprite *sprite) static void AnimBowMon_Step2(struct Sprite *sprite) { sprite->data[0] = 4; - sprite->data[1] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) ? -3 : 3; + sprite->data[1] = (!IsOnPlayerSide(gBattleAnimAttacker)) ? -3 : 3; sprite->data[2] = 0; sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; StoreSpriteCallbackInData6(sprite, AnimBowMon_Step4); @@ -6017,7 +6017,7 @@ static void AnimBowMon_Step3_Callback(struct Sprite *sprite) { sprite->data[3] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[6] = GetBattlerSide(gBattleAnimAttacker); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[4] = 0xFC00; sprite->data[5] = 0xC00; @@ -6058,7 +6058,7 @@ static void AnimTipMon_Step(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[2] = gBattlerSpriteIds[gBattleAnimAttacker]; sprite->data[3] = GetBattlerSide(gBattleAnimAttacker); - sprite->data[4] = (sprite->data[3] != B_SIDE_PLAYER) ? 0x200 : -0x200; + sprite->data[4] = !IsOnPlayerSide(gBattleAnimAttacker) ? 0x200 : -0x200; sprite->data[5] = 0; PrepareBattlerSpriteForRotScale(sprite->data[2], ST_OAM_OBJ_NORMAL); sprite->data[0]++; @@ -6089,11 +6089,8 @@ static void AnimTipMon_Step(struct Sprite *sprite) void AnimTask_SkullBashPosition(u8 taskId) { - u8 side; - gTasks[taskId].data[0] = gBattlerSpriteIds[gBattleAnimAttacker]; - side = GetBattlerSide(gBattleAnimAttacker); - gTasks[taskId].data[1] = side; + gTasks[taskId].data[1] = GetBattlerSide(gBattleAnimAttacker); gTasks[taskId].data[2] = 0; switch (gBattleAnimArgs[0]) { @@ -6105,7 +6102,7 @@ void AnimTask_SkullBashPosition(u8 taskId) gTasks[taskId].data[3] = 8; gTasks[taskId].data[4] = 0; gTasks[taskId].data[5] = 3; - if (side == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) gTasks[taskId].data[5] *= -1; gTasks[taskId].func = AnimTask_SkullBashPositionSet; @@ -6114,7 +6111,7 @@ void AnimTask_SkullBashPosition(u8 taskId) gTasks[taskId].data[3] = 8; gTasks[taskId].data[4] = 0x600; gTasks[taskId].data[5] = 0xC0; - if (side == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { gTasks[taskId].data[4] = -gTasks[taskId].data[4]; gTasks[taskId].data[5] = -gTasks[taskId].data[5]; @@ -6450,10 +6447,10 @@ static void UNUSED AnimTask_HideBattlersHealthbox(u8 taskId) u8 i; for (i = 0; i < gBattlersCount; i++) { - if (gBattleAnimArgs[0] == TRUE && GetBattlerSide(i) == B_SIDE_PLAYER) + if (gBattleAnimArgs[0] == TRUE && IsOnPlayerSide(i)) SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]); - if (gBattleAnimArgs[1] == TRUE && GetBattlerSide(i) == B_SIDE_OPPONENT) + if (gBattleAnimArgs[1] == TRUE && !IsOnPlayerSide(i)) SetHealthboxSpriteInvisible(gHealthboxSpriteIds[i]); } @@ -6653,7 +6650,7 @@ static void AnimHornHit(struct Sprite *sprite) sprite->data[4] = sprite->y << 7; sprite->data[5] = -0xA00 / sprite->data[1]; } - else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= 40; sprite->y += 20; @@ -6740,7 +6737,7 @@ void PrepareDoubleTeamAnim(u32 taskId, u32 animBattler, bool32 forAllySwitch) gSprites[spriteId].sBattlerFlank = (animBattler == ANIM_ATTACKER); // correct direction on opponent side - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId].sBattlerFlank ^= 1; gSprites[spriteId].callback = AnimDoubleTeam; @@ -6843,10 +6840,9 @@ static void TrySwapWishBattlerIds(u32 battlerAtk, u32 battlerPartner) // if used future sight on opposing side, properly track who used it if (gSideStatuses[oppSide] & SIDE_STATUS_FUTUREATTACK) { - u32 battlerAtkSide = GetBattlerSide(battlerAtk); for (i = 0; i < gBattlersCount; i++) { - if (battlerAtkSide == GetBattlerSide(i)) + if (IsBattlerAlly(i, battlerAtk)) continue; // only on opposing side if (gWishFutureKnock.futureSightBattlerIndex[i] == battlerAtk) @@ -7175,7 +7171,7 @@ static void AnimWavyMusicNotes_Step(struct Sprite *sprite) static void AnimFlyingMusicNotes(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[1] *= -1; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1]; @@ -7272,7 +7268,7 @@ static void AnimSlowFlyingMusicNotes_Step(struct Sprite *sprite) void SetSpriteNextToMonHead(u8 battler, struct Sprite *sprite) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_RIGHT) + 8; else sprite->x = GetBattlerSpriteCoordAttr(battler, BATTLER_COORD_ATTR_LEFT) - 8; @@ -7290,7 +7286,7 @@ void AnimThoughtBubble(struct Sprite *sprite) battler = gBattleAnimTarget; SetSpriteNextToMonHead(battler, sprite); - animNum = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? 0 : 1; + animNum = (IsOnPlayerSide(battler)) ? 0 : 1; sprite->data[0] = gBattleAnimArgs[1]; sprite->data[1] = animNum + 2; StartSpriteAnim(sprite, animNum); @@ -7399,7 +7395,7 @@ static void AnimTauntFinger(struct Sprite *sprite) battler = gBattleAnimTarget; SetSpriteNextToMonHead(battler, sprite); - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { StartSpriteAnim(sprite, 0); sprite->data[0] = 2; diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index d309c163aa..e0583c7cf8 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1399,7 +1399,7 @@ static void AnimVibrateBattlerBack(struct Sprite *sprite) sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); spriteId = gBattlerSpriteIds[gBattleAnimTarget]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -1451,7 +1451,7 @@ static void AnimTask_Withdraw_Step(u8 taskId) { u8 spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; s16 rotation; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) rotation = -gTasks[taskId].data[0]; else rotation = gTasks[taskId].data[0]; @@ -1499,13 +1499,13 @@ static void AnimTask_Withdraw_Step(u8 taskId) static void AnimKinesisZapEnergy(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->hFlip = 1; if (gBattleAnimArgs[2]) @@ -1557,7 +1557,7 @@ void AnimSonicBoomProjectile(struct Sprite *sprite) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; } - else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -1724,7 +1724,7 @@ void AnimTask_AirCutterProjectile(u8 taskId) } else { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { gTasks[taskId].data[4] = 1; gBattleAnimArgs[0] = -gBattleAnimArgs[0]; @@ -1841,7 +1841,7 @@ static void AnimCoinThrow(struct Sprite *sprite) InitSpritePosToAnimAttacker(sprite, TRUE); r6 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); r7 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[3]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; r6 += gBattleAnimArgs[2]; @@ -1866,7 +1866,7 @@ static void AnimFallingCoin_Step(struct Sprite *sprite) { sprite->data[0] += 0x80; sprite->x2 = sprite->data[0] >> 8; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 = -sprite->x2; sprite->y2 = Sin(sprite->data[1], sprite->data[2]); @@ -1942,7 +1942,7 @@ static void AnimBulletSeed_Step2(struct Sprite *sprite) static void AnimRazorWindTornado(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) sprite->y += 16; sprite->data[0] = gBattleAnimArgs[4]; @@ -2321,7 +2321,7 @@ void AnimTask_ShrinkAndGrow(u8 taskId) // No args. static void AnimBreathPuff(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { StartSpriteAnim(sprite, 0); sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + 32; @@ -2355,7 +2355,7 @@ void AnimAngerMark(struct Sprite *sprite) else battler = gBattleAnimTarget; - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) gBattleAnimArgs[1] *= -1; sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[1]; @@ -2399,7 +2399,7 @@ void AnimTask_ThrashMoveMonVertical(u8 taskId) task->data[7] = 0; task->data[8] = 0; task->data[9] = 2; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) task->data[2] *= -1; task->func = AnimTask_ThrashMoveMonVertical_Step; @@ -2638,7 +2638,7 @@ static void AnimBlendThinRing(struct Sprite *sprite) else r4 = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2); - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) gBattleAnimArgs[0] -= (x - r4) - gBattleAnimArgs[0]; // This is weird. else gBattleAnimArgs[0] = x - r4; @@ -2690,7 +2690,7 @@ void AnimHyperVoiceRing(struct Sprite *sprite) yCoordType = BATTLER_COORD_Y_PIC_OFFSET; } - if (GetBattlerSide(battler1) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler1)) { startX = GetBattlerSpriteCoord(battler1, xCoordType) + gBattleAnimArgs[0]; if (IsBattlerSpriteVisible(BATTLE_PARTNER(battler2))) @@ -2726,7 +2726,7 @@ void AnimHyperVoiceRing(struct Sprite *sprite) y = GetBattlerSpriteCoord(battler2, yCoordType); } - if (GetBattlerSide(battler2) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler2)) x += gBattleAnimArgs[3]; else x -= gBattleAnimArgs[3]; @@ -2759,7 +2759,7 @@ static void AnimSoftBoiledEgg(struct Sprite *sprite) { s16 r1; InitSpritePosToAnimAttacker(sprite, FALSE); - r1 = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? -160 : 160; + r1 = !IsOnPlayerSide(gBattleAnimAttacker) ? -160 : 160; sprite->data[0] = 0x380; sprite->data[1] = r1; sprite->data[7] = gBattleAnimArgs[2]; @@ -2772,7 +2772,7 @@ static void AnimSoftBoiledEgg_Step1(struct Sprite *sprite) sprite->y2 -= (sprite->data[0] >> 8); sprite->x2 = sprite->data[1] >> 8; sprite->data[0] -= 32; - add = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? -160 : 160; + add = !IsOnPlayerSide(gBattleAnimAttacker) ? -160 : 160; sprite->data[1] += add; if (sprite->y2 > 0) { @@ -2886,7 +2886,7 @@ void AnimTask_ExtremeSpeedImpact(u8 taskId) task->data[2] = 0; task->data[3] = 0; task->data[12] = 3; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { task->data[13] = 0xFFFF; task->data[14] = 8; @@ -3119,7 +3119,7 @@ static void SetMusicNotePalette(struct Sprite *sprite, u8 a, u8 b) static void AnimHealBellMusicNote(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -3395,9 +3395,9 @@ void AnimTask_ScaryFace(u8 taskId) bool32 onPlayer; if (gAnimMoveIndex == MOVE_BITTER_MALICE) - onPlayer = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; + onPlayer = IsOnPlayerSide(gBattleAnimAttacker); else - onPlayer = GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT; + onPlayer = !IsOnPlayerSide(gBattleAnimTarget); SetGpuReg(REG_OFFSET_BLDCNT, BLDCNT_TGT2_ALL | BLDCNT_TGT1_BG1 | BLDCNT_EFFECT_BLEND); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(0, 16)); @@ -3751,7 +3751,7 @@ static void AnimJaggedMusicNote(struct Sprite *sprite) { u8 battler = !gBattleAnimArgs[0] ? gBattleAnimAttacker : gBattleAnimTarget; - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) gBattleAnimArgs[1] *= -1; sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[1]; diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index 462a1a642c..affa5e7ce3 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -1575,7 +1575,7 @@ static void AnimSpikes(struct Sprite *sprite) InitSpritePosToAnimAttacker(sprite, TRUE); SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &x, &y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -1625,7 +1625,7 @@ static void AnimLetterZ(struct Sprite *sprite) SetAnimSpriteInitialXOffset(sprite, gBattleAnimArgs[0]); if (!IsContest()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[1] = gBattleAnimArgs[2]; sprite->data[2] = gBattleAnimArgs[3]; @@ -1662,7 +1662,7 @@ static void AnimFang(struct Sprite *sprite) void AnimTask_IsTargetPlayerSide(u8 taskId) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimTarget)) gBattleAnimArgs[ARG_RET_ID] = FALSE; else gBattleAnimArgs[ARG_RET_ID] = TRUE; @@ -2245,7 +2245,7 @@ static void AnimBatonPassPokeball(struct Sprite *sprite) static void AnimWishStar(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x = -16; else sprite->x = DISPLAY_WIDTH + 16; @@ -2259,7 +2259,7 @@ static void AnimWishStar_Step(struct Sprite *sprite) u32 newX; sprite->data[0] += 72; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 = sprite->data[0] >> 4; else sprite->x2 = -(sprite->data[0] >> 4); @@ -2459,7 +2459,7 @@ void AnimTask_HideSwapSprite(u8 taskId) gSprites[spriteId].x = gTasks[taskId].data[11]; // restores battler position if (!IsContest()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { if (gTasks[taskId].data[10] == 0) SetBattlerShadowSpriteCallback(gBattleAnimAttacker, gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies); @@ -2573,7 +2573,7 @@ void AnimTask_TransformMon(u8 taskId) if (!IsContest()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { if (gTasks[taskId].data[10] == 0) SetBattlerShadowSpriteCallback(gBattleAnimAttacker, gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies); @@ -2614,7 +2614,7 @@ void AnimTask_MorningSunLightBeam(u8 taskId) } else { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattle_BG1_X = -135; else gBattle_BG1_X = -10; @@ -2826,7 +2826,7 @@ void AnimTask_DoomDesireLightBeam(u8 taskId) break; case 1: gTasks[taskId].data[3] = 0; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimTarget)) gBattle_BG1_X = gTasks[taskId].data[10] + gDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]]; else gBattle_BG1_X = gTasks[taskId].data[10] - gDoomDesireLightBeamCoordTable[gTasks[taskId].data[2]]; @@ -2903,7 +2903,7 @@ static void AnimWeakFrustrationAngerMark(struct Sprite *sprite) sprite->data[1] += 160; sprite->data[2] += 128; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 = -(sprite->data[1] >> 8); else sprite->x2 = sprite->data[1] >> 8; @@ -3018,7 +3018,7 @@ static void AnimTask_RockMonBackAndForth_Step(u8 taskId) // arg 2: unused void AnimSweetScentPetal(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = 0; sprite->y = gBattleAnimArgs[0]; @@ -3037,7 +3037,7 @@ void AnimSweetScentPetal(struct Sprite *sprite) static void AnimSweetScentPetal_Step(struct Sprite *sprite) { sprite->data[0] += 3; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x += 5; sprite->y -= 1; @@ -3214,13 +3214,13 @@ void AnimTask_PainSplitMovement(u8 taskId) case 1: SetSpriteRotScale(spriteId, 0xD0, 0x130, 0xF00); SetBattlerSpriteYOffsetFromYScale(spriteId); - if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER) + if (IsContest() || IsOnPlayerSide(gTasks[taskId].data[11])) gSprites[spriteId].y2 += 16; break; case 2: SetSpriteRotScale(spriteId, 0xD0, 0x130, 0xF100); SetBattlerSpriteYOffsetFromYScale(spriteId); - if (IsContest() || GetBattlerSide(gTasks[taskId].data[11]) == B_SIDE_PLAYER) + if (IsContest() || IsOnPlayerSide(gTasks[taskId].data[11])) gSprites[spriteId].y2 += 16; break; } @@ -3421,7 +3421,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId) else { struct Pokemon *mon = GetBattlerMon(gBattleAnimTarget); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) isBackPic = FALSE; else isBackPic = TRUE; @@ -3507,7 +3507,7 @@ void AnimTask_AcidArmor(u8 taskId) task->data[7] = 0; task->data[8] = 24; - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) task->data[8] *= -1; task->data[13] = GetBattlerYCoordWithElevation(battler) - 34; @@ -3762,7 +3762,7 @@ void AnimSmokeBallEscapeCloud(struct Sprite *sprite) { sprite->data[0] = gBattleAnimArgs[3]; StartSpriteAffineAnim(sprite, gBattleAnimArgs[0]); - if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimTarget)) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + gBattleAnimArgs[1]; @@ -3882,7 +3882,7 @@ void AnimTask_SlideMonForFocusBand(u8 taskId) if (gBattleAnimArgs[3]) gTasks[taskId].data[6] = gTasks[taskId].data[6] | -0x8000; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gTasks[taskId].data[2] = gBattleAnimArgs[1]; gTasks[taskId].data[3] = gBattleAnimArgs[2]; @@ -4114,7 +4114,7 @@ void AnimTask_StatusClearedEffect(u8 taskId) // arg 2: which direction (0 = upward, 1 = downward, 2 = horizontal) static void AnimRoarNoiseLine(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0]; @@ -4136,7 +4136,7 @@ static void AnimRoarNoiseLine(struct Sprite *sprite) sprite->data[0] = 0x280; } - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[0] = -sprite->data[0]; sprite->hFlip = 1; @@ -4194,7 +4194,7 @@ void AnimTask_GlareEyeDots(u8 taskId) task->tIsContest = FALSE; } - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) task->tStartX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_HEIGHT) / 4; else task->tStartX = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) - GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_HEIGHT) / 4; @@ -4362,7 +4362,7 @@ void AnimTask_BarrageBall(u8 taskId) gSprites[task->data[15]].data[4] = task->data[14]; gSprites[task->data[15]].data[5] = -32; InitAnimArcTranslation(&gSprites[task->data[15]]); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(&gSprites[task->data[15]], 1); task->func = AnimTask_BarrageBall_Step; @@ -4702,7 +4702,7 @@ void AnimTask_HelpingHandAttackerMovement(u8 taskId) } else { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) task->data[14] = -1; else task->data[14] = 1; @@ -4812,7 +4812,7 @@ static void AnimForesightMagnifyingGlass(struct Sprite *sprite) sprite->data[7] = gBattleAnimTarget; } - if (GetBattlerSide(sprite->data[7]) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(sprite->data[7])) sprite->oam.matrixNum = ST_OAM_HFLIP; sprite->oam.priority = GetBattlerSpriteBGPriority(sprite->data[7]); @@ -4951,7 +4951,7 @@ static void AnimMeteorMashStar(struct Sprite *sprite) s16 UNUSED y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); s16 UNUSED x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER || IsContest()) + if (IsOnPlayerSide(gBattleAnimTarget) || IsContest()) { sprite->data[0] = sprite->x - gBattleAnimArgs[0]; sprite->data[2] = sprite->x - gBattleAnimArgs[2]; @@ -5070,7 +5070,7 @@ void AnimBlockX(struct Sprite *sprite) { s16 y; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->subpriority = GetBattlerSpriteSubpriority(gBattleAnimTarget) - 2; y = -144; @@ -5279,7 +5279,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) case 0: spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); gTasks[taskId].data[1] += 0x800; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8); else gSprites[spriteId].x2 -= (gTasks[taskId].data[1] >> 8); @@ -5312,7 +5312,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) else species = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; isBackPic = FALSE; @@ -5336,7 +5336,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) case 2: spriteId2 = gTasks[taskId].data[15]; gTasks[taskId].data[1] += 0x800; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId2].x2 -= (gTasks[taskId].data[1] >> 8); else gSprites[spriteId2].x2 += (gTasks[taskId].data[1] >> 8); @@ -5345,7 +5345,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) x = gSprites[spriteId2].x + gSprites[spriteId2].x2; if (gTasks[taskId].data[14] == 0) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { if (x < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X)) { @@ -5373,7 +5373,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); spriteId2 = gTasks[taskId].data[15]; DestroySpriteAndFreeResources_(&gSprites[spriteId2]); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId].x2 = -gSprites[spriteId].x - 32; else gSprites[spriteId].x2 = DISPLAY_WIDTH + 32 - gSprites[spriteId].x; @@ -5383,7 +5383,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) case 4: spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); gTasks[taskId].data[1] += 0x800; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { gSprites[spriteId].x2 += (gTasks[taskId].data[1] >> 8); if (gSprites[spriteId].x2 + gSprites[spriteId].x >= GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X)) @@ -5415,7 +5415,7 @@ static void AnimUnusedItemBagSteal(struct Sprite *sprite) sprite->data[0] = -32; sprite->data[7]++; sprite->invisible = FALSE; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT && !IsContest()) + if (!IsOnPlayerSide(gBattleAnimAttacker) && !IsContest()) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority - 1; } else @@ -5434,7 +5434,7 @@ static void AnimUnusedItemBagSteal(struct Sprite *sprite) } sprite->data[2] += 0x100; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 -= (sprite->data[2] >> 8); else sprite->x2 += (sprite->data[2] >> 8); @@ -5513,7 +5513,7 @@ void AnimTask_TeeterDanceMovement(u8 taskId) { struct Task *task = &gTasks[taskId]; task->data[3] = GetAnimBattlerSpriteId(ANIM_ATTACKER); - task->data[4] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1; + task->data[4] = IsOnPlayerSide(gBattleAnimAttacker) ? 1 : -1; task->data[6] = gSprites[task->data[3]].y; task->data[5] = gSprites[task->data[3]].x; task->data[9] = 0; @@ -5560,7 +5560,7 @@ static void AnimTask_TeeterDanceMovement_Step(u8 taskId) void AnimKnockOffStrike_Step(struct Sprite *sprite) { // These two cases are identical. - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->data[1] += sprite->data[0]; sprite->data[1] &= 0xFF; @@ -5584,7 +5584,7 @@ void AnimKnockOffStrike_Step(struct Sprite *sprite) // arg 1: initial y pixel offset static void AnimKnockOffStrike(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; diff --git a/src/battle_anim_electric.c b/src/battle_anim_electric.c index 9f461528f5..bc8d321458 100644 --- a/src/battle_anim_electric.c +++ b/src/battle_anim_electric.c @@ -603,7 +603,7 @@ const struct SpriteTemplate gVoltSwitchSpriteTemplate = // functions static void AnimLightning(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -620,7 +620,7 @@ static void AnimLightning_Step(struct Sprite *sprite) static void AnimUnusedSpinningFist(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -639,7 +639,7 @@ static void AnimUnusedCirclingShock(struct Sprite *sprite) sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; sprite->y -= gBattleAnimArgs[1]; @@ -767,7 +767,7 @@ static void AnimThunderboltOrb_Step(struct Sprite *sprite) static void AnimThunderboltOrb(struct Sprite *sprite) { - if (IsContest() || GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsContest() || IsOnPlayerSide(gBattleAnimTarget)) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; sprite->x = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[1]; @@ -788,7 +788,7 @@ void AnimSparkElectricityFlashing(struct Sprite *sprite) else battler = gBattleAnimAttacker; - if (IsContest() || GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsContest() || IsOnPlayerSide(battler)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2) + gBattleAnimArgs[0]; @@ -1099,7 +1099,7 @@ static void AnimVoltTackleOrbSlide(struct Sprite *sprite) sprite->data[6] = GetAnimBattlerSpriteId(ANIM_ATTACKER); sprite->data[7] = 16; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[7] *= -1; sprite->callback = AnimVoltTackleOrbSlide_Step; @@ -1130,7 +1130,7 @@ void AnimTask_VoltTackleAttackerReappear(u8 taskId) case 0: task->data[15] = GetAnimBattlerSpriteId(ANIM_ATTACKER); task->data[14] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { task->data[14] = -32; task->data[13] = 2; @@ -1186,7 +1186,7 @@ void AnimTask_VoltTackleBolt(u8 taskId) switch(task->data[0]) { case 0: - task->data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1; + task->data[1] = IsOnPlayerSide(gBattleAnimAttacker) ? 1 : -1; switch (gBattleAnimArgs[0]) { @@ -1583,7 +1583,7 @@ void AnimTask_VoltSwitch(struct Sprite* sprite) { InitSpritePosToAnimAttacker(sprite, FALSE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; else sprite->y += 10; //Move slightly down diff --git a/src/battle_anim_fight.c b/src/battle_anim_fight.c index d26c6507e1..63500ab701 100644 --- a/src/battle_anim_fight.c +++ b/src/battle_anim_fight.c @@ -492,7 +492,7 @@ static void AnimUnusedHumanoidFoot(struct Sprite *sprite) static void AnimSlideHandOrFootToTarget(struct Sprite *sprite) { - if (gBattleAnimArgs[7] == 1 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[7] == 1 && !IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -564,7 +564,7 @@ static void AnimFistOrFootRandomPos(struct Sprite *sprite) if (Random2() & 1) y *= -1; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) y -= 16; sprite->x += x; @@ -644,7 +644,7 @@ static void AnimSlidingKick(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; @@ -984,7 +984,7 @@ void AnimSuperpowerFireball(struct Sprite *sprite) if (IsContest()) sprite->oam.matrixNum |= ST_OAM_HFLIP; - else if (GetBattlerSide(battler) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(battler)) sprite->oam.matrixNum |= (ST_OAM_HFLIP | ST_OAM_VFLIP); sprite->data[0] = 16; @@ -1018,7 +1018,7 @@ static void AnimArmThrustHit(struct Sprite *sprite) sprite->data[4] = gBattleAnimArgs[2]; turn = gAnimMoveTurn; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) turn++; if (turn & 1) @@ -1044,7 +1044,7 @@ void AnimRevengeScratch(struct Sprite *sprite) { StartSpriteAnim(sprite, 2); } - else if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(gBattleAnimAttacker)) { StartSpriteAnim(sprite, 1); } @@ -1088,7 +1088,7 @@ void AnimTask_MoveSkyUppercutBg(u8 taskId) task->data[10] += 2816; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) gBattle_BG3_X += task->data[9] >> 8; else gBattle_BG3_X -= task->data[9] >> 8; diff --git a/src/battle_anim_fire.c b/src/battle_anim_fire.c index bebbba725f..276b8c8c07 100644 --- a/src/battle_anim_fire.c +++ b/src/battle_anim_fire.c @@ -594,7 +594,7 @@ void AnimFirePlume(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -616,7 +616,7 @@ void AnimFirePlume(struct Sprite *sprite) static void AnimLargeFlame(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -652,7 +652,7 @@ static void AnimUnusedSmallEmber(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; } @@ -1026,7 +1026,7 @@ static void CreateEruptionLaunchRocks(u8 spriteId, u8 taskId, u8 activeSpritesId u16 y = GetEruptionLaunchRockInitialYPos(spriteId); u16 x = gSprites[spriteId].x; - if(GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if(IsOnPlayerSide(gBattleAnimAttacker)) { x -= 12; sign = 1; @@ -1072,7 +1072,7 @@ static u16 GetEruptionLaunchRockInitialYPos(u8 spriteId) { s16 y = gSprites[spriteId].y + gSprites[spriteId].y2 + gSprites[spriteId].centerToCornerVecY; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) y += 74; else y += 44; @@ -1206,7 +1206,7 @@ void AnimWillOWispOrb(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[2]); sprite->data[7] = gBattleAnimArgs[2]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[4] = 4; } @@ -1220,7 +1220,7 @@ void AnimWillOWispOrb(struct Sprite *sprite) break; case 1: sprite->data[1] += 192; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->y2 = -(sprite->data[1] >> 8); } @@ -1327,7 +1327,7 @@ void AnimTask_MoveHeatWaveTargets(u8 taskId) { struct Task *task = &gTasks[taskId]; - task->data[12] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER ? 1 : -1; + task->data[12] = IsOnPlayerSide(gBattleAnimAttacker) ? 1 : -1; task->data[13] = IsBattlerSpriteVisible(BATTLE_PARTNER(gBattleAnimTarget)) + 1; task->data[14] = GetAnimBattlerSpriteId(ANIM_TARGET); task->data[15] = GetAnimBattlerSpriteId(ANIM_DEF_PARTNER); diff --git a/src/battle_anim_flying.c b/src/battle_anim_flying.c index e9600dc14a..41eef4718a 100644 --- a/src/battle_anim_flying.c +++ b/src/battle_anim_flying.c @@ -427,7 +427,7 @@ static void AnimTask_AnimateGustTornadoPalette_Step(u8 taskId) static void AnimGustToTarget(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -448,7 +448,7 @@ static void AnimGustToTarget_Step(struct Sprite *sprite) void AnimAirWaveCrescent(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -513,7 +513,7 @@ void AnimFlyBallUp_Step(struct Sprite *sprite) void AnimFlyBallAttack(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = DISPLAY_WIDTH + 32; sprite->y = -32; @@ -601,7 +601,7 @@ static void AnimFallingFeather(struct Sprite *sprite) else battler = gBattleAnimTarget; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x = GetBattlerSpriteCoord(battler, BATTLER_COORD_ATTR_HEIGHT) + gBattleAnimArgs[0]; @@ -930,8 +930,8 @@ static void AnimWhirlwindLine(struct Sprite * sprite) else InitSpritePosToAnimTarget(sprite, FALSE); - if ((gBattleAnimArgs[2] == ANIM_ATTACKER && GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) - || (gBattleAnimArgs[2] == ANIM_TARGET && GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)) + if ((gBattleAnimArgs[2] == ANIM_ATTACKER && IsOnPlayerSide(gBattleAnimAttacker)) + || (gBattleAnimArgs[2] == ANIM_TARGET && IsOnPlayerSide(gBattleAnimTarget))) { sprite->x += 8; } @@ -1284,7 +1284,7 @@ void AnimTask_LoadWindstormBackground(u8 taskId) AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Sandstorm, 0); LoadPalette(gBattleAnimSpritePal_Windstorm, animBg.paletteId * 16, 32); - if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[0] && !IsOnPlayerSide(gBattleAnimAttacker)) var0 = 1; gTasks[taskId].data[0] = var0; diff --git a/src/battle_anim_ghost.c b/src/battle_anim_ghost.c index 1b266dd709..4a7c5f4874 100644 --- a/src/battle_anim_ghost.c +++ b/src/battle_anim_ghost.c @@ -597,7 +597,7 @@ void AnimTask_NightmareClone(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_EFFECT_BLEND | BLDCNT_TGT2_ALL)); SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(task->data[2], task->data[3])); gSprites[task->data[0]].data[0] = 80; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { gSprites[task->data[0]].data[1] = -144; gSprites[task->data[0]].data[2] = 112; @@ -1031,7 +1031,7 @@ void AnimTask_CurseStretchingBlackBg(u8 taskId) SetGpuReg(REG_OFFSET_BLDCNT, (BLDCNT_TGT1_BG3 | BLDCNT_EFFECT_DARKEN)); SetGpuReg(REG_OFFSET_BLDY, 16); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER || IsContest()) + if (!IsOnPlayerSide(gBattleAnimAttacker) || IsContest()) startX = 40; else startX = 200; @@ -1114,7 +1114,7 @@ static void AnimCurseNail(struct Sprite *sprite) s16 xDelta2; InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { xDelta = 24; xDelta2 = -2; @@ -1205,7 +1205,7 @@ void AnimGhostStatusSprite(struct Sprite *sprite) u16 coeffA; sprite->x2 = Sin(sprite->data[0], 12); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x2 = -sprite->x2; sprite->data[0] = (sprite->data[0] + 6) & 0xFF; @@ -1283,7 +1283,7 @@ void AnimTask_GrudgeFlames_Step(u8 taskId) if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = taskId; - gSprites[spriteId].data[1] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; + gSprites[spriteId].data[1] = IsOnPlayerSide(gBattleAnimAttacker); gSprites[spriteId].data[2] = (i * 42) & 0xFF; gSprites[spriteId].data[3] = task->data[11]; diff --git a/src/battle_anim_ground.c b/src/battle_anim_ground.c index 10303ffe2e..bd230a1403 100644 --- a/src/battle_anim_ground.c +++ b/src/battle_anim_ground.c @@ -202,7 +202,7 @@ static void AnimBonemerangProjectile_End(struct Sprite *sprite) static void AnimBoneHitProjectile(struct Sprite *sprite) { InitSpritePosToAnimTarget(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; diff --git a/src/battle_anim_ice.c b/src/battle_anim_ice.c index 7cc2395bf0..ac2205c692 100644 --- a/src/battle_anim_ice.c +++ b/src/battle_anim_ice.c @@ -703,7 +703,7 @@ static void AnimIceBeamParticle(struct Sprite *sprite) InitSpritePosToAnimAttacker(sprite, TRUE); sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; @@ -728,7 +728,7 @@ void AnimIceEffectParticle(struct Sprite *sprite) else { SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x += gBattleAnimArgs[0]; @@ -775,7 +775,7 @@ static void AnimSwirlingSnowball(struct Sprite *sprite) SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]); } - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; @@ -821,7 +821,7 @@ void AnimSwirlingSnowball_Step1(struct Sprite *sprite) sprite->x2 = 0; sprite->data[0] = 128; - tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20; + tempVar = !IsOnPlayerSide(gBattleAnimAttacker) ? 20 : -20; sprite->data[3] = Sin(sprite->data[0], tempVar); sprite->data[4] = Cos(sprite->data[0], 0xF); @@ -833,7 +833,7 @@ void AnimSwirlingSnowball_Step1(struct Sprite *sprite) static void AnimSwirlingSnowball_Step2(struct Sprite *sprite) { s16 tempVar; - tempVar = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 20 : -20; + tempVar = !IsOnPlayerSide(gBattleAnimAttacker) ? 20 : -20; if (sprite->data[5] <= 31) { @@ -897,7 +897,7 @@ void AnimMoveParticleBeyondTarget(struct Sprite *sprite) SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->data[2], &sprite->data[4]); } - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[2] -= gBattleAnimArgs[2]; else sprite->data[2] += gBattleAnimArgs[2]; @@ -969,7 +969,7 @@ static void AnimWaveFromCenterOfTarget(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x += gBattleAnimArgs[0]; @@ -1006,7 +1006,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) else { SetAverageBattlerPositions(gBattleAnimAttacker, FALSE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -1025,7 +1025,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) else { SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimTarget)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -1043,7 +1043,7 @@ static void InitSwirlingFogAnim(struct Sprite *sprite) tempVar = 0x40; sprite->data[6] = tempVar; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) sprite->y += 8; sprite->data[0] = gBattleAnimArgs[3]; @@ -1289,12 +1289,12 @@ static void InitPoisonGasCloudAnim(struct Sprite *sprite) if (GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) < GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2)) sprite->data[7] = 0x8000; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; - if ((sprite->data[7] & 0x8000) && GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if ((sprite->data[7] & 0x8000) && IsOnPlayerSide(gBattleAnimAttacker)) sprite->subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_TARGET)].subpriority + 1; sprite->data[6] = 1; @@ -1373,7 +1373,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite) sprite->data[7]++; if (IsContest()) sprite->data[5] = 80; - else if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(gBattleAnimTarget)) sprite->data[5] = 204; else sprite->data[5] = 80; @@ -1419,7 +1419,7 @@ static void MovePoisonGasCloud(struct Sprite *sprite) sprite->data[4] = sprite->y + 4; if (IsContest()) sprite->data[2] = -16; - else if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(gBattleAnimTarget)) sprite->data[2] = DISPLAY_WIDTH + 16; else sprite->data[2] = -16; @@ -1618,7 +1618,7 @@ static void InitIceBallAnim(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[4]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; diff --git a/src/battle_anim_mon_movement.c b/src/battle_anim_mon_movement.c index 49390bb3d4..995c39d6d0 100644 --- a/src/battle_anim_mon_movement.c +++ b/src/battle_anim_mon_movement.c @@ -443,7 +443,7 @@ static void AnimTask_TranslateMonElliptical_Step(u8 taskId) // arg 4: speed (valid values are 0-5) void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; AnimTask_TranslateMonElliptical(taskId); @@ -456,7 +456,7 @@ void AnimTask_TranslateMonEllipticalRespectSide(u8 taskId) static void DoHorizontalLunge(struct Sprite *sprite) { sprite->invisible = TRUE; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[1] = -gBattleAnimArgs[1]; else sprite->data[1] = gBattleAnimArgs[1]; @@ -616,7 +616,7 @@ static void SlideMonToOffset(struct Sprite *sprite) battler = gBattleAnimTarget; monSpriteId = gBattlerSpriteIds[battler]; - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 1) @@ -649,7 +649,7 @@ static void SlideMonToOffsetPartner(struct Sprite *sprite) battler = BATTLE_PARTNER(gBattleAnimTarget); monSpriteId = gBattlerSpriteIds[battler]; - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 1) @@ -684,7 +684,7 @@ static void SlideMonToOffsetAndBack(struct Sprite *sprite) battlerId = gBattleAnimTarget; spriteId = gBattlerSpriteIds[battlerId]; - if (GetBattlerSide(battlerId)) + if (!IsOnPlayerSide(battlerId)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; if (gBattleAnimArgs[3] == 1) @@ -734,7 +734,7 @@ static void SlideMonToOffsetAndBack_End(struct Sprite *sprite) void AnimTask_WindUpLunge(u8 taskId) { s16 wavePeriod = 0x8000 / gBattleAnimArgs[3]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; gBattleAnimArgs[5] = -gBattleAnimArgs[5]; @@ -798,7 +798,7 @@ static void AnimTask_WindUpLunge_Step2(u8 taskId) void AnimTask_DuckDownHop(u8 taskId) { s16 wavePeriod = 0x8000 / gBattleAnimArgs[3]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -879,7 +879,7 @@ void AnimTask_SlideOffScreen(u8 taskId) return; } gTasks[taskId].data[0] = spriteId; - if (GetBattlerSide(gBattleAnimTarget) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimTarget)) { gTasks[taskId].data[1] = gBattleAnimArgs[1]; } @@ -912,7 +912,7 @@ static void AnimTask_SlideOffScreen_Step(u8 taskId) void AnimTask_SwayMon(u8 taskId) { u8 spriteId; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[4]); @@ -955,7 +955,7 @@ static void AnimTask_SwayMonStep(u8 taskId) } else { - if (GetBattlerSide(gTasks[taskId].data[5]) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gTasks[taskId].data[5])) { gSprites[spriteId].y2 = (sineValue >= 0) ? sineValue : -sineValue; } @@ -1051,11 +1051,11 @@ void AnimTask_RotateMonSpriteToSide(u8 taskId) { if (gBattleAnimArgs[2] == ANIM_ATTACKER) { - gTasks[taskId].data[7] = GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER; + gTasks[taskId].data[7] = IsOnPlayerSide(gBattleAnimAttacker); } else { - gTasks[taskId].data[7] = GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER; + gTasks[taskId].data[7] = IsOnPlayerSide(gBattleAnimTarget); } } if (gTasks[taskId].data[7]) @@ -1078,14 +1078,14 @@ void AnimTask_RotateMonToSideAndRestore(u8 taskId) gTasks[taskId].data[2] = gBattleAnimArgs[0]; if (gBattleAnimArgs[2] == ANIM_ATTACKER) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } } else { - if (GetBattlerSide(gBattleAnimTarget)) + if (!IsOnPlayerSide(gBattleAnimTarget)) { gBattleAnimArgs[1] = -gBattleAnimArgs[1]; } @@ -1244,7 +1244,7 @@ void AnimTask_RotateVertically(u8 taskId) PrepareBattlerSpriteForRotScale(spriteId, ST_OAM_OBJ_NORMAL); gTasks[taskId].tSpriteId = spriteId; gTasks[taskId].tRotCurr = 0; - gTasks[taskId].tPlayerSide = ((GetBattlerSide(GetAnimBattlerId(gBattleAnimArgs[0]))) == B_SIDE_PLAYER); + gTasks[taskId].tPlayerSide = IsOnPlayerSide(GetAnimBattlerId(gBattleAnimArgs[0])); gTasks[taskId].tRotMax = gTasks[taskId].tPlayerSide ? 0x1FFF : 0x7FFE; gTasks[taskId].tRotSpeed = gBattleAnimArgs[1]; gTasks[taskId].func = AnimTask_RotateVerticallyStep; diff --git a/src/battle_anim_mons.c b/src/battle_anim_mons.c index d0de7a24f7..3ab6716e10 100644 --- a/src/battle_anim_mons.c +++ b/src/battle_anim_mons.c @@ -169,7 +169,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species) } } - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER || IsContest()) + if (IsOnPlayerSide(battlerId) || IsContest()) ret = gSpeciesInfo[species].backPicYOffset; else ret = gSpeciesInfo[species].frontPicYOffset; @@ -179,7 +179,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species) u8 GetBattlerElevation(u8 battlerId, u16 species) { u8 ret = 0; - if (GetBattlerSide(battlerId) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battlerId)) { if (!IsContest()) { @@ -195,7 +195,7 @@ u8 GetBattlerSpriteFinal_Y(u8 battlerId, u16 species, bool8 a3) u16 offset; u8 y; - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER || IsContest()) + if (IsOnPlayerSide(battlerId) || IsContest()) { offset = GetBattlerYDelta(battlerId, species); } @@ -207,7 +207,7 @@ u8 GetBattlerSpriteFinal_Y(u8 battlerId, u16 species, bool8 a3) y = offset + sBattlerCoords[GetBattlerCoordsIndex(battlerId)][GetBattlerPosition(battlerId)].y; if (a3) { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) y += 8; if (y > DISPLAY_HEIGHT - MON_PIC_HEIGHT + 8) y = DISPLAY_HEIGHT - MON_PIC_HEIGHT + 8; @@ -256,7 +256,7 @@ u8 GetBattlerSpriteDefault_Y(u8 battlerId) u8 GetSubstituteSpriteDefault_Y(u8 battlerId) { u16 y; - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battlerId)) y = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_Y) + 16; else y = GetBattlerSpriteCoord(battlerId, BATTLER_COORD_Y) + 17; @@ -279,7 +279,7 @@ u8 GetBattlerYCoordWithElevation(u8 battlerId) else species = spriteInfo[battlerId].transformSpecies; - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battlerId)) y -= GetBattlerElevation(battlerId, species); } return y; @@ -690,7 +690,7 @@ void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset) } else { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= xOffset; else sprite->x += xOffset; @@ -1485,7 +1485,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) coordType = BATTLER_COORD_Y; InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -1504,7 +1504,7 @@ void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite) void AnimThrowProjectile(struct Sprite *sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; @@ -1545,7 +1545,7 @@ void AnimTravelDiagonally(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, respectOffsets); battlerId = gBattleAnimTarget; } - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; InitSpritePosToAnimTarget(sprite, respectOffsets); sprite->data[0] = gBattleAnimArgs[4]; @@ -1855,7 +1855,7 @@ static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId) else species = spriteInfo[battlerId].transformSpecies; - if (GetBattlerSide(i) == B_SIDE_PLAYER) + if (IsOnPlayerSide(i)) return gSpeciesInfo[species].backPicYOffset; else return gSpeciesInfo[species].frontPicYOffset; @@ -2100,7 +2100,7 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr) if (species == SPECIES_UNOWN) species = GetUnownSpeciesId(personality); - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { #if P_GENDER_DIFFERENCES if (gSpeciesInfo[species].backPicFemale != NULL && IsPersonalityFemale(species, personality)) @@ -2195,7 +2195,7 @@ u8 CreateInvisibleSpriteCopy(int battlerId, u8 spriteId, int species) void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] = -gBattleAnimArgs[3]; @@ -2217,7 +2217,7 @@ void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite) // Used by three different unused battle anim sprite templates. void AnimTranslateLinearAndFlicker(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x -= gBattleAnimArgs[0]; gBattleAnimArgs[3] *= -1; @@ -2240,7 +2240,7 @@ void AnimTranslateLinearAndFlicker(struct Sprite *sprite) void AnimSpinningSparkle(struct Sprite *sprite) { SetSpriteCoordsToAnimAttackerCoords(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -2272,7 +2272,7 @@ void AnimTask_AttackerPunchWithTrace(u8 taskId) struct Task *task = &gTasks[taskId]; task->tBattlerSpriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); - task->tMoveSpeed = (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) ? -8 : 8; + task->tMoveSpeed = (!IsOnPlayerSide(gBattleAnimAttacker)) ? -8 : 8; task->tState = 0; task->tCounter = 0; gSprites[task->tBattlerSpriteId].x2 -= task->tBattlerSpriteId; @@ -2371,7 +2371,7 @@ void AnimWeatherBallUp(struct Sprite *sprite) { sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) sprite->data[0] = 5; else sprite->data[0] = -10; @@ -2397,7 +2397,7 @@ void AnimWeatherBallDown(struct Sprite *sprite) sprite->data[0] = gBattleAnimArgs[2]; sprite->data[2] = sprite->x + gBattleAnimArgs[4]; sprite->data[4] = sprite->y + gBattleAnimArgs[5]; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { x = (u16)gBattleAnimArgs[4] + 30; sprite->x += x; diff --git a/src/battle_anim_new.c b/src/battle_anim_new.c index 0cd2bc9dcf..1ecf064be8 100644 --- a/src/battle_anim_new.c +++ b/src/battle_anim_new.c @@ -7505,7 +7505,7 @@ static void SetSpriteCoordsToAnimTargetCoords(struct Sprite *sprite) static void AnimBlastBurnTargetPlume(struct Sprite *sprite) { SetSpriteCoordsToAnimTargetCoords(sprite); - if (GetBattlerSide(gBattleAnimTarget)) + if (!IsOnPlayerSide(gBattleAnimTarget)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -7594,13 +7594,13 @@ static void SpriteCB_SpriteOnMonForDuration(struct Sprite *sprite) static void SpriteCB_ToxicThreadWrap(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) sprite->y += 8; sprite->callback = AnimStringWrap_Step; @@ -7624,7 +7624,7 @@ static void SpriteCB_GrowingSuperpower(struct Sprite *sprite) sprite->oam.priority = GetBattlerSpriteBGPriority(gBattleAnimTarget); } - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(sprite, 1); sprite->data[0] = 16; @@ -7713,7 +7713,7 @@ static void SpriteCB_TranslateAnimSpriteToTargetMonLocationDoubles(struct Sprite coordType = BATTLER_COORD_Y; InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; target = LoadBattleAnimTarget(6); @@ -7750,7 +7750,7 @@ static void SpriteCB_FallingObject(struct Sprite *sprite) sprite->y = gBattleAnimArgs[1]; sprite->y2 = -gBattleAnimArgs[1]; - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->y += 45; sprite->y2 -= 45; @@ -7786,7 +7786,7 @@ static void SpriteCB_FallingObjectStep(struct Sprite *sprite) static void SpriteCB_SunsteelStrikeRings(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = 272; sprite->y = -32; @@ -8071,7 +8071,7 @@ static void InitSpritePositionForPyroBall(struct Sprite *sprite) InitSpritePosToAnimAttacker(sprite, FALSE); sprite->y += 20; //Move closer to attacker's feet - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) sprite->y += 20; //Move below the text box } @@ -8096,7 +8096,7 @@ static void SpriteCB_PyroBallLaunch(struct Sprite *sprite) { InitSpritePositionForPyroBall(sprite); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -8119,7 +8119,7 @@ static void SpriteCB_AcidLaunchSingleTarget(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, TRUE); l1 = sprite->x; l2 = sprite->y; InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[4] = -gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[2]; @@ -8133,7 +8133,7 @@ static void SpriteCB_AcidLaunchSingleTarget(struct Sprite *sprite) //Causes acid to drip down a single target. static void SpriteCB_AcidDripSingleTarget(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x += gBattleAnimArgs[0]; @@ -8350,7 +8350,7 @@ static void SpriteCB_GeyserTarget(struct Sprite *sprite) //// Anim Tasks Functions void AnimTask_IsAttackerPlayerSide(u8 taskId) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[7] = 0; else gBattleAnimArgs[7] = 1; @@ -8781,7 +8781,7 @@ static void SpriteCB_PowerShiftBall(struct Sprite* sprite) { InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] *= -1; //Flip X sprite->data[0] = gBattleAnimArgs[4]; //Duration @@ -8837,7 +8837,7 @@ void SpriteCB_HorizontalSliceStep(struct Sprite *sprite) //arg 2: flip static void SpriteCB_LashOutStrike(struct Sprite* sprite) { - bool8 flip = GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER; + bool8 flip = IsOnPlayerSide(gBattleAnimTarget); if (gBattleAnimArgs[2]) flip ^= 1; @@ -9088,7 +9088,7 @@ static void SpriteCB_DragonEnergyShot(struct Sprite* sprite) y /= 2; } - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimTarget)) { startingX = 0; finishingX = 255; @@ -9202,7 +9202,7 @@ static void SpriteCB_GlacialLance_Step2(struct Sprite* sprite) { if (sprite->data[7]++ >= sprite->data[6]) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) StartSpriteAffineAnim(sprite, 2); else StartSpriteAffineAnim(sprite, 1); diff --git a/src/battle_anim_normal.c b/src/battle_anim_normal.c index f825c717a5..cc55e63b0d 100644 --- a/src/battle_anim_normal.c +++ b/src/battle_anim_normal.c @@ -349,7 +349,7 @@ static void AnimConfusionDuck(struct Sprite *sprite) sprite->x += gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; sprite->data[0] = gBattleAnimArgs[2]; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->data[1] = -gBattleAnimArgs[3]; sprite->data[4] = 1; @@ -1079,7 +1079,7 @@ static void AnimHitSplatPersistent(struct Sprite *sprite) // Used by Twineedle and Spike Cannon static void AnimHitSplatHandleInvert(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER && !IsContest()) + if (!IsOnPlayerSide(gBattleAnimAttacker) && !IsContest()) gBattleAnimArgs[1] = -gBattleAnimArgs[1]; AnimHitSplatBasic(sprite); diff --git a/src/battle_anim_poison.c b/src/battle_anim_poison.c index 6c96c2be29..39f30708c4 100644 --- a/src/battle_anim_poison.c +++ b/src/battle_anim_poison.c @@ -485,7 +485,7 @@ static void AnimSuckerPunch(struct Sprite *sprite) InitSpritePosToAnimTarget(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[3]; @@ -551,7 +551,7 @@ static void AnimAcidPoisonBubble(struct Sprite *sprite) else l1 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2), l2 = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[4] = -gBattleAnimArgs[4]; sprite->data[0] = gBattleAnimArgs[2]; @@ -602,7 +602,7 @@ static void AnimAcidPoisonDroplet(struct Sprite *sprite) if (gBattleAnimArgs[5]) SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x += gBattleAnimArgs[0]; @@ -632,7 +632,7 @@ void AnimBubbleEffect(struct Sprite *sprite) { SetAverageBattlerPositions(gBattleAnimTarget, TRUE, &sprite->x, &sprite->y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x += gBattleAnimArgs[0]; diff --git a/src/battle_anim_psychic.c b/src/battle_anim_psychic.c index e49ac83d1c..141bbb1168 100644 --- a/src/battle_anim_psychic.c +++ b/src/battle_anim_psychic.c @@ -493,7 +493,7 @@ static void AnimPsychoCut(struct Sprite *sprite) } else { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[2] = -gBattleAnimArgs[2]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -554,7 +554,7 @@ static void AnimDefensiveWall(struct Sprite *sprite) { u8 isContest = IsContest(); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER || isContest) + if (IsOnPlayerSide(gBattleAnimAttacker) || isContest) { sprite->oam.priority = 2; sprite->subpriority = 200; @@ -578,7 +578,7 @@ static void AnimDefensiveWall(struct Sprite *sprite) if (!isContest && IsDoubleBattle()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = 72; sprite->y = 80; @@ -591,7 +591,7 @@ static void AnimDefensiveWall(struct Sprite *sprite) } else { - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[0] = -gBattleAnimArgs[0]; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X) + gBattleAnimArgs[0]; @@ -720,7 +720,7 @@ static void AnimWallSparkle(struct Sprite *sprite) if (!IsContest() && IsDoubleBattle()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = 72 - gBattleAnimArgs[0]; sprite->y = gBattleAnimArgs[1] + 80; @@ -753,7 +753,7 @@ static void AnimBentSpoon(struct Sprite *sprite) sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { StartSpriteAnim(sprite, 1); sprite->x -= 40; @@ -777,7 +777,7 @@ static void AnimQuestionMark(struct Sprite *sprite) s16 x = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_WIDTH) / 2; s16 y = GetBattlerSpriteCoordAttr(gBattleAnimAttacker, BATTLER_COORD_ATTR_HEIGHT) / -2; - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) x = -x; sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) + x; @@ -841,7 +841,7 @@ void AnimTask_Teleport(u8 taskId) task->data[0] = spriteId; task->data[1] = 0; task->data[2] = 0; - task->data[3] = GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER ? 4 : 8; + task->data[3] = !IsOnPlayerSide(gBattleAnimAttacker) ? 4 : 8; PrepareAffineAnimInTaskData(task, task->data[0], sAffineAnim_Teleport); task->func = AnimTask_Teleport_Step; diff --git a/src/battle_anim_rock.c b/src/battle_anim_rock.c index 23d940bafd..2fccb9201d 100644 --- a/src/battle_anim_rock.c +++ b/src/battle_anim_rock.c @@ -378,7 +378,7 @@ static void AnimStealthRock(struct Sprite *sprite) InitSpritePosToAnimAttacker(sprite, TRUE); SetAverageBattlerPositions(gBattleAnimTarget, FALSE, &x, &y); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; @@ -454,7 +454,7 @@ void AnimRockFragment(struct Sprite *sprite) StartSpriteAnim(sprite, gBattleAnimArgs[5]); AnimateSprite(sprite); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) sprite->x -= gBattleAnimArgs[0]; else sprite->x += gBattleAnimArgs[0]; @@ -539,7 +539,7 @@ void AnimTask_LoadSandstormBackground(u8 taskId) AnimLoadCompressedBgTilemapHandleContest(&animBg, gBattleAnimBgTilemap_Sandstorm, FALSE); LoadPalette(gBattleAnimSpritePal_FlyingDirt, BG_PLTT_ID(animBg.paletteId), PLTT_SIZE_4BPP); - if (gBattleAnimArgs[0] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[0] && !IsOnPlayerSide(gBattleAnimAttacker)) var0 = 1; gTasks[taskId].data[0] = var0; @@ -621,7 +621,7 @@ void AnimFlyingSandCrescent(struct Sprite *sprite) { if (sprite->data[0] == 0) { - if (gBattleAnimArgs[3] != 0 && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[3] != 0 && !IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = DISPLAY_WIDTH + 64; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; @@ -947,7 +947,7 @@ static void AnimRockTomb_Step(struct Sprite *sprite) void AnimRockBlastRock(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) StartSpriteAffineAnim(sprite, 1); TranslateAnimSpriteToTargetMonLocation(sprite); diff --git a/src/battle_anim_throw.c b/src/battle_anim_throw.c index d4f8f6152e..fe27b7138a 100644 --- a/src/battle_anim_throw.c +++ b/src/battle_anim_throw.c @@ -2320,7 +2320,7 @@ void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId) case 0: gTasks[taskId].data[11] = gBattleAnimArgs[0]; gTasks[taskId].data[0] += 0x500; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8; else gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8; @@ -2336,13 +2336,13 @@ void AnimTask_SwapMonSpriteToFromSubstitute(u8 taskId) break; case 2: gTasks[taskId].data[0] += 0x500; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gSprites[spriteId].x2 -= gTasks[taskId].data[0] >> 8; else gSprites[spriteId].x2 += gTasks[taskId].data[0] >> 8; gTasks[taskId].data[0] &= 0xFF; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { if (gSprites[spriteId].x2 <= 0) { @@ -2513,7 +2513,7 @@ static void Task_ShinyStars(u8 taskId) gSprites[spriteId].invisible = TRUE; if (gTasks[taskId].tStarIdx == 0) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) pan = -64; else pan = 63; diff --git a/src/battle_anim_utility_funcs.c b/src/battle_anim_utility_funcs.c index 0f9ab46347..54b9f949ba 100644 --- a/src/battle_anim_utility_funcs.c +++ b/src/battle_anim_utility_funcs.c @@ -732,7 +732,7 @@ void AnimTask_StartSlidingBg(u8 taskId) UpdateAnimBg3ScreenSize(FALSE); newTaskId = CreateTask(AnimTask_UpdateSlidingBg, 5); - if (gBattleAnimArgs[2] && GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (gBattleAnimArgs[2] && !IsOnPlayerSide(gBattleAnimAttacker)) { gBattleAnimArgs[0] = -gBattleAnimArgs[0]; gBattleAnimArgs[1] = -gBattleAnimArgs[1]; diff --git a/src/battle_anim_water.c b/src/battle_anim_water.c index 74cf8c1653..e367a29300 100644 --- a/src/battle_anim_water.c +++ b/src/battle_anim_water.c @@ -626,7 +626,7 @@ static void AnimAquaTail(struct Sprite *sprite) // args[1] - initial y delta static void AnimKnockOffAquaTail(struct Sprite *sprite) { - if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimTarget)) { sprite->x -= gBattleAnimArgs[0]; sprite->y += gBattleAnimArgs[1]; @@ -699,7 +699,7 @@ static void AnimWaterBubbleProjectile(struct Sprite *sprite) { u8 spriteId; - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2) - gBattleAnimArgs[0]; sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1]; @@ -711,7 +711,7 @@ static void AnimWaterBubbleProjectile(struct Sprite *sprite) sprite->y = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET) + gBattleAnimArgs[1]; sprite->animPaused = TRUE; } - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[6]; sprite->data[1] = sprite->x; @@ -773,7 +773,7 @@ static void AnimAuroraBeamRings(struct Sprite *sprite) s16 unkArg; InitSpritePosToAnimAttacker(sprite, TRUE); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) unkArg = -gBattleAnimArgs[2]; else unkArg = gBattleAnimArgs[2]; @@ -917,7 +917,7 @@ static void AnimHydroCannonCharge(struct Sprite *sprite) priority = GetBattlerSpriteSubpriority(gBattleAnimAttacker); if (!IsContest()) { - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { sprite->x2 = 10; sprite->subpriority = priority + 2; @@ -962,7 +962,7 @@ static void AnimHydroCannonBeam(struct Sprite *sprite) else coordType = BATTLER_COORD_Y; InitSpritePosToAnimAttacker(sprite, respectMonPicOffsets); - if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleAnimAttacker)) gBattleAnimArgs[2] = -gBattleAnimArgs[2]; sprite->data[0] = gBattleAnimArgs[4]; sprite->data[2] = GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_X_2) + gBattleAnimArgs[2]; @@ -1024,7 +1024,7 @@ void AnimTask_CreateSurfWave(u8 taskId) if (!IsContest()) { SetAnimBgAttribute(1, BG_ANIM_CHAR_BASE_BLOCK, 1); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattleAnimAttacker)) AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_SurfOpponent); else AnimLoadCompressedBgTilemap(animBg.bgId, gBattleAnimBgTilemap_SurfPlayer); @@ -1064,7 +1064,7 @@ void AnimTask_CreateSurfWave(u8 taskId) gTasks[taskId].data[1] = 1; gTasks[taskId2].data[3] = 0; } - else if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT) + else if (!IsOnPlayerSide(gBattleAnimAttacker)) { *x = -224; *y = 256; @@ -1433,7 +1433,7 @@ void AnimTask_WaterSpoutRain(u8 taskId) struct Task *task = &gTasks[taskId]; task->data[1] = GetWaterSpoutPowerForAnim(); - if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleAnimAttacker)) { task->data[4] = 136; task->data[6] = 40; @@ -1552,7 +1552,7 @@ void AnimTask_WaterSport(u8 taskId) task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); task->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); - task->data[7] = (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_PLAYER) ? 1 : -1; + task->data[7] = (IsOnPlayerSide(gBattleAnimAttacker)) ? 1 : -1; if (IsContest()) task->data[7] *= -1; task->data[5] = task->data[3] + task->data[7] * 8; diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 47a1f260da..2acf9ebb5f 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -511,7 +511,7 @@ void HandleInputChooseTarget(u32 battler) if (gAbsentBattlerFlags & (1u << gMultiUsePlayerCursor) || !CanTargetBattler(battler, gMultiUsePlayerCursor, move) - || (moveTarget & MOVE_TARGET_OPPONENT && GetBattlerSide(gMultiUsePlayerCursor) == B_SIDE_PLAYER)) + || (moveTarget & MOVE_TARGET_OPPONENT && IsOnPlayerSide(gMultiUsePlayerCursor))) i = 0; } while (i == 0); } @@ -562,7 +562,7 @@ void HandleInputChooseTarget(u32 battler) if (gAbsentBattlerFlags & (1u << gMultiUsePlayerCursor) || !CanTargetBattler(battler, gMultiUsePlayerCursor, move) - || (moveTarget & MOVE_TARGET_OPPONENT && GetBattlerSide(gMultiUsePlayerCursor) == B_SIDE_PLAYER)) + || (moveTarget & MOVE_TARGET_OPPONENT && IsOnPlayerSide(gMultiUsePlayerCursor))) i = 0; } while (i == 0); } @@ -2030,7 +2030,7 @@ static void PlayerHandlePrintString(u32 battler) static void PlayerHandlePrintSelectionString(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) PlayerHandlePrintString(battler); else PlayerBufferExecCompleted(battler); @@ -2118,7 +2118,7 @@ static void PlayerHandleChooseAction(u32 battler) static void PlayerHandleYesNoBox(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { HandleBattleWindow(YESNOBOX_X_Y, 0); BattlePutTextOnWindow(gText_BattleYesNoChoice, B_WIN_YESNO); diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c index 60fbfdc6ef..2e097a11b6 100644 --- a/src/battle_controller_safari.c +++ b/src/battle_controller_safari.c @@ -267,7 +267,7 @@ static void SafariHandlePrintString(u32 battler) static void SafariHandlePrintSelectionString(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) SafariHandlePrintString(battler); else SafariBufferExecCompleted(battler); diff --git a/src/battle_controller_wally.c b/src/battle_controller_wally.c index f184eb2ce7..cc929de786 100644 --- a/src/battle_controller_wally.c +++ b/src/battle_controller_wally.c @@ -326,7 +326,7 @@ static void WallyHandlePrintString(u32 battler) static void WallyHandlePrintSelectionString(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) WallyHandlePrintString(battler); else WallyBufferExecCompleted(battler); diff --git a/src/battle_controllers.c b/src/battle_controllers.c index f8238d8078..3daccb9754 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -631,7 +631,7 @@ static void SetBattlePartyIds(void) { if (i < 2) { - if (GetBattlerSide(i) == B_SIDE_PLAYER) + if (IsOnPlayerSide(i)) { if (IsValidForBattle(&gPlayerParty[j])) { @@ -650,7 +650,7 @@ static void SetBattlePartyIds(void) } else { - if (GetBattlerSide(i) == B_SIDE_PLAYER) + if (IsOnPlayerSide(i)) { if (IsValidForBattle(&gPlayerParty[j]) && gBattlerPartyIndexes[i - 2] != j) { @@ -2061,7 +2061,7 @@ static void SetBattlerMonData(u32 battler, struct Pokemon *party, u32 monId) break; } - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) HandleLowHpMusicChange(&party[gBattlerPartyIndexes[battler]], battler); } @@ -2088,8 +2088,20 @@ static bool8 ShouldDoSlideInAnim(u32 battler) void StartSendOutAnim(u32 battler, bool32 dontClearTransform, bool32 dontClearSubstituteBit, bool32 doSlideIn) { u16 species; - u32 side = GetBattlerSide(battler); struct Pokemon *mon = GetBattlerMon(battler); + u32 sendoutType; + + if (IsOnPlayerSide(battler)) + { + if (doSlideIn) + sendoutType = POKEBALL_PLAYER_SLIDEIN; + else + sendoutType = POKEBALL_PLAYER_SENDOUT; + } + else + { + sendoutType = POKEBALL_OPPONENT_SENDOUT; + } ClearTemporarySpeciesSpriteData(battler, dontClearTransform, dontClearSubstituteBit); gBattlerPartyIndexes[battler] = gBattleResources->bufferA[battler][1]; @@ -2098,7 +2110,7 @@ void StartSendOutAnim(u32 battler, bool32 dontClearTransform, bool32 dontClearSu species = GetMonData(mon, MON_DATA_SPECIES); gBattleControllerData[battler] = CreateInvisibleSpriteWithCallback(SpriteCB_WaitForBattlerBallReleaseAnim); // Load sprite for opponent only, player sprite is expected to be already loaded. - if (side == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) BattleLoadMonSpriteGfx(mon, battler); SetMultiuseSpriteTemplateToPokemon(species, GetBattlerPosition(battler)); @@ -2116,14 +2128,14 @@ void StartSendOutAnim(u32 battler, bool32 dontClearTransform, bool32 dontClearSu gSprites[gBattleControllerData[battler]].data[1] = gBattlerSpriteIds[battler]; gSprites[gBattleControllerData[battler]].data[2] = battler; - gSprites[gBattleControllerData[battler]].data[0] = DoPokeballSendOutAnimation(battler, 0, (side == B_SIDE_OPPONENT) ? POKEBALL_OPPONENT_SENDOUT : (doSlideIn ? POKEBALL_PLAYER_SLIDEIN : POKEBALL_PLAYER_SENDOUT)); + gSprites[gBattleControllerData[battler]].data[0] = DoPokeballSendOutAnimation(battler, 0, sendoutType); } static void FreeMonSprite(u32 battler) { FreeSpriteOamMatrix(&gSprites[gBattlerSpriteIds[battler]]); DestroySprite(&gSprites[gBattlerSpriteIds[battler]]); - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) HideBattlerShadowSprite(battler); SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]); } @@ -2151,7 +2163,7 @@ static void Controller_ReturnMonToBall(u32 battler) if (!gBattleSpritesDataPtr->healthBoxesData[battler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0; - InitAndLaunchSpecialAnimation(battler, battler, battler, (GetBattlerSide(battler) == B_SIDE_OPPONENT) ? B_ANIM_SWITCH_OUT_OPPONENT_MON : B_ANIM_SWITCH_OUT_PLAYER_MON); + InitAndLaunchSpecialAnimation(battler, battler, battler, (!IsOnPlayerSide(battler)) ? B_ANIM_SWITCH_OUT_OPPONENT_MON : B_ANIM_SWITCH_OUT_PLAYER_MON); gBattlerControllerFuncs[battler] = Controller_ReturnMonToBall2; } break; @@ -2234,7 +2246,7 @@ static void Controller_HandleTrainerSlideBack(u32 battler) { if (gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].callback == SpriteCallbackDummy) { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) FreeTrainerFrontPicPalette(gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].oam.affineParam); FreeSpriteOamMatrix(&gSprites[gBattleStruct->trainerSlideSpriteIds[battler]]); DestroySprite(&gSprites[gBattleStruct->trainerSlideSpriteIds[battler]]); @@ -2253,7 +2265,7 @@ void Controller_WaitForHealthBar(u32 battler) } else { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) HandleLowHpMusicChange(GetBattlerMon(battler), battler); BattleControllerComplete(battler); } @@ -2465,7 +2477,7 @@ void BtlController_HandleReturnMonToBall(u32 battler) void BtlController_HandleDrawTrainerPic(u32 battler, u32 trainerPicId, bool32 isFrontPic, s16 xPos, s16 yPos, s32 subpriority) { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) // Always the front sprite for the opponent. + if (!IsOnPlayerSide(battler)) // Always the front sprite for the opponent. { DecompressTrainerFrontPic(trainerPicId, battler); SetMultiuseSpriteTemplateToTrainerFront(trainerPicId, GetBattlerPosition(battler)); @@ -2527,7 +2539,7 @@ void BtlController_HandleDrawTrainerPic(u32 battler, u32 trainerPicId, bool32 is void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { DecompressTrainerBackPic(trainerPicId, battler); SetMultiuseSpriteTemplateToTrainerBack(trainerPicId, GetBattlerPosition(battler)); @@ -2561,11 +2573,9 @@ void BtlController_HandleTrainerSlide(u32 battler, u32 trainerPicId) void BtlController_HandleTrainerSlideBack(u32 battler, s16 data0, bool32 startAnim) { - u32 side = GetBattlerSide(battler); - SetSpritePrimaryCoordsFromSecondaryCoords(&gSprites[gBattleStruct->trainerSlideSpriteIds[battler]]); gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].data[0] = data0; - gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].data[2] = (side == B_SIDE_PLAYER) ? -40 : 280; + gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].data[2] = IsOnPlayerSide(battler) ? -40 : 280; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].data[4] = gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].y; gSprites[gBattleStruct->trainerSlideSpriteIds[battler]].callback = StartAnimLinearTranslation; StoreSpriteCallbackInData6(&gSprites[gBattleStruct->trainerSlideSpriteIds[battler]], SpriteCallbackDummy); @@ -2591,7 +2601,7 @@ void BtlController_HandleFaintAnimation(u32 battler) if (!gBattleSpritesDataPtr->healthBoxesData[battler].specialAnimActive) { gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { HandleLowHpMusicChange(GetBattlerMon(battler), battler); gSprites[gBattlerSpriteIds[battler]].sSpeedX = 0; @@ -2757,7 +2767,7 @@ void BtlController_HandleHitAnimation(u32 battler) void BtlController_HandlePlaySE(u32 battler) { - s8 pan = (GetBattlerSide(battler) == B_SIDE_PLAYER) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; + s8 pan = (IsOnPlayerSide(battler)) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; PlaySE12WithPanning(gBattleResources->bufferA[battler][1] | (gBattleResources->bufferA[battler][2] << 8), pan); BattleControllerComplete(battler); @@ -2783,7 +2793,7 @@ void BtlController_HandleFaintingCry(u32 battler) struct Pokemon *party; s8 pan; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { party = gPlayerParty; pan = -25; @@ -2886,7 +2896,7 @@ void BtlController_HandleIntroTrainerBallThrow(u32 battler, u16 tagTrainerPal, c static bool32 TwoMonsAtSendOut(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { if (TwoPlayerIntroMons(battler) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) return TRUE; @@ -2968,7 +2978,7 @@ static void SpriteCB_FreeOpponentSprite(struct Sprite *sprite) void BtlController_HandleDrawPartyStatusSummary(u32 battler, u32 side, bool32 considerDelay) { - if (gBattleResources->bufferA[battler][1] != 0 && GetBattlerSide(battler) == B_SIDE_PLAYER) + if (gBattleResources->bufferA[battler][1] != 0 && IsOnPlayerSide(battler)) { BattleControllerComplete(battler); } @@ -3033,7 +3043,7 @@ static void AnimateMonAfterKnockout(u32 battler) u32 oppositeBattler = BATTLE_OPPOSITE(battler); u32 partnerBattler = BATTLE_PARTNER(oppositeBattler); - bool32 wasPlayerSideKnockedOut = (GetBattlerSide(battler) == B_SIDE_PLAYER); + bool32 wasPlayerSideKnockedOut = (IsOnPlayerSide(battler)); if (IsBattlerAlive(oppositeBattler)) LaunchKOAnimation(oppositeBattler, ReturnAnimIdForBattler(wasPlayerSideKnockedOut, oppositeBattler), wasPlayerSideKnockedOut); diff --git a/src/battle_debug.c b/src/battle_debug.c index c2073754a0..2f83f1d4ab 100644 --- a/src/battle_debug.c +++ b/src/battle_debug.c @@ -1126,7 +1126,7 @@ static void PutAiInfoText(struct BattleDebugMenu *data) // items info for (i = 0; i < gBattlersCount; i++) { - if (GetBattlerSide(i) == B_SIDE_PLAYER && IsBattlerAlive(i)) + if (IsOnPlayerSide(i) && IsBattlerAlive(i)) { u16 ability = AI_DATA->abilities[i]; enum ItemHoldEffect holdEffect = AI_DATA->holdEffects[i]; @@ -1213,7 +1213,7 @@ static void Task_ShowAiKnowledge(u8 taskId) LoadMonIconPalettes(); for (count = 0, i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (GetBattlerSide(i) == B_SIDE_PLAYER && IsBattlerAlive(i)) + if (IsOnPlayerSide(i) && IsBattlerAlive(i)) { data->spriteIds.aiIconSpriteIds[i] = CreateMonIcon(gBattleMons[i].species, SpriteCallbackDummy, diff --git a/src/battle_dynamax.c b/src/battle_dynamax.c index 7593f8c14f..93642f4c93 100644 --- a/src/battle_dynamax.c +++ b/src/battle_dynamax.c @@ -77,7 +77,7 @@ bool32 CanDynamax(u32 battler) enum ItemHoldEffect holdEffect = GetBattlerHoldEffect(battler, FALSE); // Prevents Zigzagoon from dynamaxing in vanilla. - if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && !IsOnPlayerSide(battler)) return FALSE; // Check if Player has a Dynamax Band. diff --git a/src/battle_end_turn.c b/src/battle_end_turn.c index 089ff0de6e..cf73c11682 100644 --- a/src/battle_end_turn.c +++ b/src/battle_end_turn.c @@ -305,7 +305,7 @@ static bool32 HandleEndTurnEmergencyExit(u32 battler) gBattlerAbility = battler; gLastUsedAbility = ability; - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER || GetBattlerSide(battler) == B_SIDE_PLAYER) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER || IsOnPlayerSide(battler)) BattleScriptExecute(BattleScript_EmergencyExitEnd2); else BattleScriptExecute(BattleScript_EmergencyExitWildEnd2); @@ -325,7 +325,7 @@ static bool32 HandleEndTurnAffection(u32 battler) if (!B_AFFECTION_MECHANICS || !IsBattlerAlive(battler) - || GetBattlerSide(battler) != B_SIDE_PLAYER) + || !IsOnPlayerSide(battler)) return effect; if (GetBattlerAffectionHearts(gBattlerAttacker) >= AFFECTION_FOUR_HEARTS && (Random() % 100 < 20)) @@ -390,7 +390,7 @@ static bool32 HandleEndTurnWish(u32 battler) PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, battler, gWishFutureKnock.wishPartyId[battler]) if (B_WISH_HP_SOURCE >= GEN_5) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) gBattleStruct->moveDamage[battler] = max(1, GetMonData(&gPlayerParty[gWishFutureKnock.wishPartyId[battler]], MON_DATA_MAX_HP) / 2); else gBattleStruct->moveDamage[battler] = max(1, GetMonData(&gEnemyParty[gWishFutureKnock.wishPartyId[battler]], MON_DATA_MAX_HP) / 2); diff --git a/src/battle_gfx_sfx_util.c b/src/battle_gfx_sfx_util.c index 76bf5dd191..1abb3d3267 100644 --- a/src/battle_gfx_sfx_util.c +++ b/src/battle_gfx_sfx_util.c @@ -351,7 +351,7 @@ static u16 GetBattlePalaceTarget(u32 battler) { u8 opposing1, opposing2; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { opposing1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); opposing2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); @@ -642,7 +642,7 @@ void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battler) } position = GetBattlerPosition(battler); - HandleLoadSpecialPokePic((GetBattlerSide(battler) == B_SIDE_OPPONENT), + HandleLoadSpecialPokePic((!IsOnPlayerSide(battler)), gMonSpritesGfxPtr->spritesGfx[position], species, personalityValue); @@ -866,7 +866,7 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battler) } break; case 5: - if (GetBattlerSide(*battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(*battler)) { if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) UpdateHealthboxAttribute(gHealthboxSpriteIds[*battler], GetBattlerMon(*battler), HEALTHBOX_ALL); @@ -970,7 +970,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bo } } - HandleLoadSpecialPokePic((GetBattlerSide(battlerAtk) != B_SIDE_PLAYER), + HandleLoadSpecialPokePic((!IsOnPlayerSide(battlerAtk)), gMonSpritesGfxPtr->spritesGfx[position], targetSpecies, personalityValue); @@ -1027,7 +1027,7 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite) if (IsContest()) LZDecompressVram(gBattleAnimSpriteGfx_SubstituteBack, gMonSpritesGfxPtr->spritesGfx[position]); - else if (GetBattlerSide(battler) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(battler)) LZDecompressVram(gBattleAnimSpriteGfx_Substitute, gMonSpritesGfxPtr->spritesGfx[position]); else LZDecompressVram(gBattleAnimSpriteGfx_SubstituteBack, gMonSpritesGfxPtr->spritesGfx[position]); @@ -1313,7 +1313,7 @@ void SetBattlerShadowSpriteCallback(u8 battler, u16 species) { if (B_ENEMY_MON_SHADOW_STYLE >= GEN_4 && P_GBA_STYLE_SPECIES_GFX == FALSE) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER || gBattleScripting.monCaught) + if (IsOnPlayerSide(battler) || gBattleScripting.monCaught) { gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary].callback = SpriteCB_SetInvisible; gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback = SpriteCB_SetInvisible; @@ -1340,7 +1340,7 @@ void SetBattlerShadowSpriteCallback(u8 battler, u16 species) } else { - if (GetBattlerSide(battler) == B_SIDE_PLAYER || gBattleScripting.monCaught) + if (IsOnPlayerSide(battler) || gBattleScripting.monCaught) { gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdPrimary].callback = SpriteCB_SetInvisible; return; diff --git a/src/battle_gimmick.c b/src/battle_gimmick.c index 4cdc754ea4..76ea80a4f6 100644 --- a/src/battle_gimmick.c +++ b/src/battle_gimmick.c @@ -71,7 +71,7 @@ bool32 ShouldTrainerBattlerUseGimmick(u32 battler, enum Gimmick gimmick) return gimmick == TestRunner_Battle_GetChosenGimmick(GetBattlerSide(battler), gBattlerPartyIndexes[battler]); } // The player can bypass these checks because they can choose through the controller. - else if (GetBattlerSide(battler) == B_SIDE_PLAYER + else if (IsOnPlayerSide(battler) && !((gBattleTypeFlags & BATTLE_TYPE_MULTI) && battler == B_POSITION_PLAYER_RIGHT)) { return TRUE; @@ -138,7 +138,7 @@ void CreateGimmickTriggerSprite(u32 battler) const struct GimmickInfo * gimmick = &gGimmicksInfo[gBattleStruct->gimmick.usableGimmick[battler]]; // Exit if there shouldn't be a sprite produced. - if (GetBattlerSide(battler) == B_SIDE_OPPONENT + if (!IsOnPlayerSide(battler) || gBattleStruct->gimmick.usableGimmick[battler] == GIMMICK_NONE || gimmick->triggerSheet == NULL || HasTrainerUsedGimmick(battler, gBattleStruct->gimmick.usableGimmick[battler])) diff --git a/src/battle_interface.c b/src/battle_interface.c index 68fc5ac408..bb79106a5f 100644 --- a/src/battle_interface.c +++ b/src/battle_interface.c @@ -658,7 +658,7 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId) default: case BATTLE_COORDS_SINGLES: { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[0], DISPLAY_WIDTH, DISPLAY_HEIGHT, 1); healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[0], DISPLAY_WIDTH, DISPLAY_HEIGHT, 1); @@ -685,7 +685,7 @@ u8 CreateBattlerHealthboxSprites(u8 battlerId) } case BATTLE_COORDS_DOUBLES: { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { healthboxLeftSpriteId = CreateSprite(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], DISPLAY_WIDTH, DISPLAY_HEIGHT, 1); healthboxRightSpriteId = CreateSpriteAtEnd(&sHealthboxPlayerSpriteTemplates[GetBattlerPosition(battlerId) / 2], DISPLAY_WIDTH, DISPLAY_HEIGHT, 1); @@ -931,7 +931,7 @@ static void UpdateLvlInHealthbox(u8 healthboxSpriteId, u8 lvl) windowTileData = AddTextPrinterAndCreateWindowOnHealthbox(text, xPos, 3, 2, &windowId); spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { objVram = (void *)(OBJ_VRAM0); switch (GetBattlerCoordsIndex(battler)) @@ -1066,7 +1066,7 @@ void UpdateHpTextInHealthbox(u32 healthboxSpriteId, u32 maxOrCurrent, s16 currHp } case BATTLE_COORDS_SINGLES: { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) // Player + if (IsOnPlayerSide(battler)) // Player { PrintHpOnHealthbox(healthboxSpriteId, currHp, maxHp, 2, 0xB00, 0x3A0); } @@ -1084,7 +1084,7 @@ static void UpdateHpTextInHealthboxInDoubles(u32 healthboxSpriteId, u32 maxOrCur { u32 barSpriteId = gSprites[healthboxSpriteId].data[5]; - if (GetBattlerSide(gSprites[healthboxSpriteId].hMain_Battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gSprites[healthboxSpriteId].hMain_Battler)) { if (gBattleSpritesDataPtr->battlerData[gSprites[healthboxSpriteId].data[6]].hpNumbersNoBars) // don't print text if only bars are visible { @@ -1176,8 +1176,8 @@ void SwapHpBarsWithHpText(void) for (i = 0; i < gBattlersCount; i++) { if (gSprites[gHealthboxSpriteIds[i]].callback == SpriteCallbackDummy - && GetBattlerSide(i) != B_SIDE_OPPONENT - && (GetBattlerCoordsIndex(i) != BATTLE_COORDS_SINGLES || GetBattlerSide(i) != B_SIDE_PLAYER)) + && IsOnPlayerSide(i) + && (GetBattlerCoordsIndex(i) != BATTLE_COORDS_SINGLES || !IsOnPlayerSide(i))) { s32 currHp = GetMonData(GetBattlerMon(i), MON_DATA_HP); s32 maxHp = GetMonData(GetBattlerMon(i), MON_DATA_MAX_HP); @@ -1185,7 +1185,7 @@ void SwapHpBarsWithHpText(void) gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars ^= 1; noBars = gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars; - if (GetBattlerSide(i) == B_SIDE_PLAYER) + if (IsOnPlayerSide(i)) { if (GetBattlerCoordsIndex(i) == BATTLE_COORDS_SINGLES) continue; @@ -1258,7 +1258,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, if (!skipPlayer || GetBattlerPosition(battlerId) != B_POSITION_OPPONENT_RIGHT) { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { isOpponent = FALSE; bar_X = 136, bar_Y = 96; @@ -1337,7 +1337,7 @@ u8 CreatePartyStatusSummarySprites(u8 battlerId, struct HpAndStatus *partyInfo, gSprites[ballIconSpritesIds[i]].data[2] = isOpponent; } - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { if (gBattleTypeFlags & BATTLE_TYPE_MULTI) { @@ -1497,7 +1497,7 @@ void Task_HidePartyStatusSummary(u8 taskId) { for (i = 0; i < PARTY_SIZE; i++) { - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battlerId)) { gSprites[ballIconSpriteIds[PARTY_SIZE - 1 - i]].data[1] = 7 * i; gSprites[ballIconSpriteIds[PARTY_SIZE - 1 - i]].data[3] = 0; @@ -1748,7 +1748,7 @@ static void UpdateNickInHealthbox(u8 healthboxSpriteId, struct Pokemon *mon) spriteTileNum = gSprites[healthboxSpriteId].oam.tileNum * TILE_SIZE_4BPP; - if (GetBattlerSide(gSprites[healthboxSpriteId].data[6]) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gSprites[healthboxSpriteId].data[6])) { TextIntoHealthboxObject((void *)(OBJ_VRAM0 + 0x40 + spriteTileNum), windowTileData, 6); ptr = (void *)(OBJ_VRAM0); @@ -1781,7 +1781,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus) return; battlerId = gSprites[healthboxSpriteId].hMain_Battler; - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) return; if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(GetBattlerMon(battlerId), MON_DATA_SPECIES)), FLAG_GET_CAUGHT)) return; @@ -1805,7 +1805,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) battlerId = gSprites[healthboxSpriteId].hMain_Battler; healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { status = GetMonData(GetBattlerMon(battlerId), MON_DATA_STATUS); switch (GetBattlerCoordsIndex(battlerId)) @@ -1874,7 +1874,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId) FillPalette(sStatusIconColors[statusPalId], OBJ_PLTT_OFFSET + pltAdder, PLTT_SIZEOF(1)); CpuCopy16(&gPlttBufferUnfaded[OBJ_PLTT_OFFSET + pltAdder], (u16 *)OBJ_PLTT + pltAdder, PLTT_SIZEOF(1)); CpuCopy32(statusGfxPtr, (void *)(OBJ_VRAM0 + (gSprites[healthboxSpriteId].oam.tileNum + tileNumAdder) * TILE_SIZE_4BPP), 96); - if (GetBattlerCoordsIndex(battlerId) == BATTLE_COORDS_DOUBLES || GetBattlerSide(battlerId) == B_SIDE_OPPONENT) + if (GetBattlerCoordsIndex(battlerId) == BATTLE_COORDS_DOUBLES || !IsOnPlayerSide(battlerId)) { if (!gBattleSpritesDataPtr->battlerData[battlerId].hpNumbersNoBars) { @@ -1990,7 +1990,7 @@ void UpdateHealthboxAttribute(u8 healthboxSpriteId, struct Pokemon *mon, u8 elem s32 maxHp = GetMonData(mon, MON_DATA_MAX_HP); s32 currHp = GetMonData(mon, MON_DATA_HP); - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { u8 isDoubles = GetBattlerCoordsIndex(battlerId) == BATTLE_COORDS_DOUBLES; diff --git a/src/battle_main.c b/src/battle_main.c index 066fc413e0..c5d17c37ea 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3257,7 +3257,6 @@ const u8* FaintClearSetData(u32 battler) { s32 i; const u8 *result = NULL; - u8 battlerSide = GetBattlerSide(battler); for (i = 0; i < NUM_BATTLE_STATS; i++) gBattleMons[battler].statStages[i] = DEFAULT_STAT_STAGE; @@ -3342,7 +3341,7 @@ const u8* FaintClearSetData(u32 battler) for (i = 0; i < gBattlersCount; i++) { - if (i != battler && GetBattlerSide(i) != battlerSide) + if (i != battler && !IsBattlerAlly(i, battler)) gBattleStruct->lastTakenMove[i] = MOVE_NONE; gBattleStruct->lastTakenMoveFrom[i][battler] = 0; @@ -3437,7 +3436,7 @@ static void DoBattleIntro(void) case BATTLE_INTRO_STATE_DRAW_SPRITES: for (battler = 0; battler < gBattlersCount; battler++) { - if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && GetBattlerSide(battler) == B_SIDE_PLAYER) + if ((gBattleTypeFlags & BATTLE_TYPE_SAFARI) && IsOnPlayerSide(battler)) { memset(&gBattleMons[battler], 0, sizeof(struct BattlePokemon)); } @@ -4724,7 +4723,7 @@ u32 GetBattlerTotalSpeedStatArgs(u32 battler, u32 ability, enum ItemHoldEffect h // player's badge boost if (!(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER)) && ShouldGetStatBadgeBoost(B_FLAG_BADGE_BOOST_SPEED, battler) - && GetBattlerSide(battler) == B_SIDE_PLAYER) + && IsOnPlayerSide(battler)) { speed = (speed * 110) / 100; } @@ -5508,7 +5507,7 @@ static void HandleEndTurn_FinishBattle(void) { for (battler = 0; battler < gBattlersCount; battler++) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { if (gBattleResults.playerMon1Species == SPECIES_NONE) { @@ -5521,7 +5520,7 @@ static void HandleEndTurn_FinishBattle(void) GetMonData(GetBattlerMon(battler), MON_DATA_NICKNAME, gBattleResults.playerMon2Name); } } - else if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + else if (!IsOnPlayerSide(battler)) { HandleSetPokedexFlag(SpeciesToNationalPokedexNum(gBattleMons[battler].species), FLAG_SET_SEEN, gBattleMons[battler].personality); } diff --git a/src/battle_message.c b/src/battle_message.c index 3034562ec3..ca69ed93bb 100644 --- a/src/battle_message.c +++ b/src/battle_message.c @@ -2131,7 +2131,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler) } break; case STRINGID_INTROSENDOUT: // poke first send-out - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { if (IsDoubleBattle() && IsValidForBattle(GetBattlerMon(BATTLE_PARTNER(battler)))) { @@ -2178,7 +2178,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler) } break; case STRINGID_RETURNMON: // sending poke to ball msg - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { if (*(&gBattleStruct->hpScale) == 0) stringPtr = sText_PkmnThatsEnough; @@ -2205,7 +2205,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler) } break; case STRINGID_SWITCHINMON: // switch-in msg - if (GetBattlerSide(gBattleScripting.battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleScripting.battler)) { if (*(&gBattleStruct->hpScale) == 0 || IsDoubleBattle()) stringPtr = sText_GoPkmn2; @@ -2266,7 +2266,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler) if (gBattleTextBuff1[0] & B_OUTCOME_LINK_BATTLE_RAN) { gBattleTextBuff1[0] &= ~(B_OUTCOME_LINK_BATTLE_RAN); - if (GetBattlerSide(battler) == B_SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW) + if (!IsOnPlayerSide(battler) && gBattleTextBuff1[0] != B_OUTCOME_DREW) gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON); if (gBattleTextBuff1[0] == B_OUTCOME_LOST || gBattleTextBuff1[0] == B_OUTCOME_DREW) @@ -2278,7 +2278,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler) } else { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT && gBattleTextBuff1[0] != B_OUTCOME_DREW) + if (!IsOnPlayerSide(battler) && gBattleTextBuff1[0] != B_OUTCOME_DREW) gBattleTextBuff1[0] ^= (B_OUTCOME_LOST | B_OUTCOME_WON); if (gBattleTypeFlags & BATTLE_TYPE_MULTI) @@ -2409,7 +2409,7 @@ static void GetBattlerNick(u32 battler, u8 *dst) } #define HANDLE_NICKNAME_STRING_CASE(battler) \ - if (GetBattlerSide(battler) != B_SIDE_PLAYER) \ + if (!IsOnPlayerSide(battler)) \ { \ if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) \ toCpy = sText_FoePkmnPrefix; \ @@ -2426,7 +2426,7 @@ static void GetBattlerNick(u32 battler, u8 *dst) toCpy = text; #define HANDLE_NICKNAME_STRING_LOWERCASE(battler) \ - if (GetBattlerSide(battler) != B_SIDE_PLAYER) \ + if (!IsOnPlayerSide(battler)) \ { \ if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) \ toCpy = sText_FoePkmnPrefixLower; \ @@ -2553,7 +2553,7 @@ static const u8 *BattleStringGetPlayerName(u8 *text, u8 battler) static const u8 *BattleStringGetTrainerName(u8 *text, u8 multiplayerId, u8 battler) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) return BattleStringGetPlayerName(text, battler); else return BattleStringGetOpponentName(text, multiplayerId, battler); @@ -2872,7 +2872,7 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize) } break; case B_TXT_26: // ? - if (GetBattlerSide(gBattleScripting.battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(gBattleScripting.battler)) { if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) toCpy = sText_FoePkmnPrefix; @@ -2900,37 +2900,37 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize) toCpy = sText_Someones; break; case B_TXT_ATK_PREFIX2: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) toCpy = sText_AllyPkmnPrefix2; else toCpy = sText_FoePkmnPrefix3; break; case B_TXT_DEF_PREFIX2: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) toCpy = sText_AllyPkmnPrefix2; else toCpy = sText_FoePkmnPrefix3; break; case B_TXT_ATK_PREFIX1: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) toCpy = sText_AllyPkmnPrefix; else toCpy = sText_FoePkmnPrefix2; break; case B_TXT_DEF_PREFIX1: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) toCpy = sText_AllyPkmnPrefix; else toCpy = sText_FoePkmnPrefix2; break; case B_TXT_ATK_PREFIX3: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) toCpy = sText_AllyPkmnPrefix3; else toCpy = sText_FoePkmnPrefix4; break; case B_TXT_DEF_PREFIX3: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) toCpy = sText_AllyPkmnPrefix3; else toCpy = sText_FoePkmnPrefix4; @@ -3085,37 +3085,37 @@ u32 BattleStringExpandPlaceholders(const u8 *src, u8 *dst, u32 dstSize) } break; case B_TXT_ATK_TEAM1: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) toCpy = sText_Your1; else toCpy = sText_Opposing1; break; case B_TXT_ATK_TEAM2: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) toCpy = sText_Your2; else toCpy = sText_Opposing2; break; case B_TXT_DEF_TEAM1: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) toCpy = sText_Your1; else toCpy = sText_Opposing1; break; case B_TXT_DEF_TEAM2: - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) toCpy = sText_Your2; else toCpy = sText_Opposing2; break; case B_TXT_SCR_TEAM1: - if (GetBattlerSide(gBattleScripting.battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleScripting.battler)) toCpy = sText_Your1; else toCpy = sText_Opposing1; break; case B_TXT_SCR_TEAM2: - if (GetBattlerSide(gBattleScripting.battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleScripting.battler)) toCpy = sText_Your2; else toCpy = sText_Opposing2; @@ -3237,7 +3237,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) break; case B_BUFF_MON_NICK_WITH_PREFIX: // poke nick with prefix case B_BUFF_MON_NICK_WITH_PREFIX_LOWER: // poke nick with lowercase prefix - if (GetBattlerSide(src[srcID + 1]) == B_SIDE_PLAYER) + if (IsOnPlayerSide(src[srcID + 1])) { GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, nickname); } @@ -3285,7 +3285,7 @@ void ExpandBattleTextBuffPlaceholders(const u8 *src, u8 *dst) } else { - if (GetBattlerSide(src[srcID + 1]) == B_SIDE_PLAYER) + if (IsOnPlayerSide(src[srcID + 1])) GetMonData(&gPlayerParty[src[srcID + 2]], MON_DATA_NICKNAME, dst); else GetMonData(&gEnemyParty[src[srcID + 2]], MON_DATA_NICKNAME, dst); diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index f09ee79ad5..e077892cbc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -2091,7 +2091,7 @@ static void Cmd_critcalc(void) } // Counter for IF_CRITICAL_HITS_GE evolution condition. - if (gSpecialStatuses[battlerDef].criticalHit && GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER + if (gSpecialStatuses[battlerDef].criticalHit && IsOnPlayerSide(gBattlerAttacker) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI && GetBattlerPosition(gBattlerAttacker) == B_POSITION_PLAYER_LEFT)) gPartyCriticalHits[partySlot]++; } @@ -2252,7 +2252,7 @@ static void Cmd_adjustdamage(void) gLastUsedItem = gBattleMons[battlerDef].item; gBattleStruct->moveResultFlags[battlerDef] |= MOVE_RESULT_FOE_HUNG_ON; } - else if (B_AFFECTION_MECHANICS == TRUE && GetBattlerSide(battlerDef) == B_SIDE_PLAYER && affectionScore >= AFFECTION_THREE_HEARTS) + else if (B_AFFECTION_MECHANICS == TRUE && IsOnPlayerSide(battlerDef) && affectionScore >= AFFECTION_THREE_HEARTS) { if ((affectionScore == AFFECTION_FIVE_HEARTS && rand < 20) || (affectionScore == AFFECTION_FOUR_HEARTS && rand < 15) @@ -2480,7 +2480,7 @@ static void Cmd_attackanimation(void) && gCurrentMove != MOVE_SUBSTITUTE && gCurrentMove != MOVE_ALLY_SWITCH // In a wild double battle gotta use the teleport animation if two wild pokemon are alive. - && !(GetMoveEffect(gCurrentMove) == EFFECT_TELEPORT && WILD_DOUBLE_BATTLE && GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT && IsBattlerAlive(BATTLE_PARTNER(gBattlerAttacker)))) + && !(GetMoveEffect(gCurrentMove) == EFFECT_TELEPORT && WILD_DOUBLE_BATTLE && !IsOnPlayerSide(gBattlerAttacker) && IsBattlerAlive(BATTLE_PARTNER(gBattlerAttacker)))) { BattleScriptPush(cmd->nextInstr); gBattlescriptCurrInstr = BattleScript_Pausex20; @@ -2577,7 +2577,7 @@ static void DoublesHPBarReduction(void) BtlController_EmitHealthBarUpdate(battlerDef, BUFFER_A, healthValue); MarkBattlerForControllerExec(battlerDef); - if (GetBattlerSide(battlerDef) == B_SIDE_PLAYER && currDmg > 0) + if (IsOnPlayerSide(battlerDef) && currDmg > 0) gBattleResults.playerMonWasDamaged = TRUE; } @@ -2613,7 +2613,7 @@ static void Cmd_healthbarupdate(void) BtlController_EmitHealthBarUpdate(battler, BUFFER_A, healthValue); MarkBattlerForControllerExec(battler); - if (GetBattlerSide(battler) == B_SIDE_PLAYER && gBattleStruct->moveDamage[battler] > 0) + if (IsOnPlayerSide(battler) && gBattleStruct->moveDamage[battler] > 0) gBattleResults.playerMonWasDamaged = TRUE; } } @@ -3439,7 +3439,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) break; case MOVE_EFFECT_PAYDAY: // Don't scatter coins on the second hit of Parental Bond - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER && gSpecialStatuses[gBattlerAttacker].parentalBondState!= PARENTAL_BOND_2ND_HIT) + if (IsOnPlayerSide(gBattlerAttacker) && gSpecialStatuses[gBattlerAttacker].parentalBondState!= PARENTAL_BOND_2ND_HIT) { u16 payday = gPaydayMoney; u16 moveTarget = GetBattlerMoveTargetType(gBattlerAttacker, gCurrentMove); @@ -3463,7 +3463,7 @@ void SetMoveEffect(bool32 primary, bool32 certain) } break; case MOVE_EFFECT_HAPPY_HOUR: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER && !gBattleStruct->moneyMultiplierMove) + if (IsOnPlayerSide(gBattlerAttacker) && !gBattleStruct->moneyMultiplierMove) { gBattleStruct->moneyMultiplier *= 2; gBattleStruct->moneyMultiplierMove = 1; @@ -4608,7 +4608,7 @@ static void Cmd_tryfaintmon(void) gHitMarker |= HITMARKER_FAINTED(battler); BattleScriptPush(cmd->nextInstr); gBattlescriptCurrInstr = faintScript; - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { gHitMarker |= HITMARKER_PLAYER_FAINTED; if (gBattleResults.playerFaintCounter < 255) @@ -4904,7 +4904,7 @@ static void Cmd_getexp(void) switch (gBattleScripting.getexpState) { case 0: // check if should receive exp at all - if (GetBattlerSide(gBattlerFainted) != B_SIDE_OPPONENT + if (IsOnPlayerSide(gBattlerFainted) || IsAiVsAiBattle() || !BattleTypeAllowsExp()) { @@ -5712,7 +5712,7 @@ static void Cmd_absorb(void) BtlController_EmitHealthBarUpdate(battler, BUFFER_A, gBattleStruct->moveDamage[battler]); MarkBattlerForControllerExec(battler); - if (GetBattlerSide(battler) == B_SIDE_PLAYER && gBattleStruct->moveDamage[battler] > 0) + if (IsOnPlayerSide(battler) && gBattleStruct->moveDamage[battler] > 0) gBattleResults.playerMonWasDamaged = TRUE; gBattlescriptCurrInstr = cmd->nextInstr; @@ -6705,7 +6705,7 @@ static void Cmd_moveend(void) gBattleScripting.moveendState++; break; case MOVEEND_UPDATE_LAST_MOVES: - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(gBattlerAttacker)) UpdateStallMons(); if ((gBattleStruct->moveResultFlags[gBattlerTarget] & (MOVE_RESULT_FAILED | MOVE_RESULT_DOESNT_AFFECT_FOE)) || (gBattleMons[gBattlerAttacker].status2 & (STATUS2_FLINCHED)) @@ -7304,7 +7304,7 @@ static void Cmd_moveend(void) gBattleScripting.battler = battler; BattleScriptPushCursor(); - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER || GetBattlerSide(battler) == B_SIDE_PLAYER) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER || IsOnPlayerSide(battler)) gBattlescriptCurrInstr = BattleScript_EmergencyExit; else gBattlescriptCurrInstr = BattleScript_EmergencyExitWild; @@ -7676,7 +7676,7 @@ static void Cmd_switchinanim(void) battler = GetBattlerForBattleScript(cmd->battler); - if (GetBattlerSide(battler) == B_SIDE_OPPONENT + if (!IsOnPlayerSide(battler) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK @@ -7701,7 +7701,7 @@ bool32 CanBattlerSwitch(u32 battler) bool32 ret = FALSE; struct Pokemon *party; - if (BATTLE_TWO_VS_ONE_OPPONENT && GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (BATTLE_TWO_VS_ONE_OPPONENT && !IsOnPlayerSide(battler)) { battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); battlerIn2 = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); @@ -7741,7 +7741,7 @@ bool32 CanBattlerSwitch(u32 battler) { if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) { party = gPlayerParty; @@ -7779,7 +7779,7 @@ bool32 CanBattlerSwitch(u32 battler) ret = (i != lastMonId + MULTI_PARTY_SIZE); } - else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && GetBattlerSide(battler) == B_SIDE_OPPONENT) + else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS && !IsOnPlayerSide(battler)) { party = gEnemyParty; @@ -7800,7 +7800,7 @@ bool32 CanBattlerSwitch(u32 battler) } else { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) { battlerIn1 = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); @@ -8868,7 +8868,7 @@ static void Cmd_incrementgamestat(void) { CMD_ARGS(u8 stat); - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) IncrementGameStat(cmd->stat); gBattlescriptCurrInstr = cmd->nextInstr; @@ -9683,7 +9683,7 @@ static bool32 TryDefogClear(u32 battlerAtk, bool32 clear) s32 i; u8 saveBattler = gBattlerAttacker; - for (i = 0; i < 2; i++) + for (i = 0; i < NUM_BATTLE_SIDES; i++) { struct SideTimer *sideTimer = &gSideTimers[i]; u32 *sideStatuses = &gSideStatuses[i]; @@ -9920,7 +9920,6 @@ void BS_CourtChangeSwapSideStatuses(void) static void HandleScriptMegaPrimalBurst(u32 caseId, u32 battler, u32 type) { struct Pokemon *mon = GetBattlerMon(battler); - u32 side = GetBattlerSide(battler); // Change species. if (caseId == 0) @@ -9944,7 +9943,7 @@ static void HandleScriptMegaPrimalBurst(u32 caseId, u32 battler, u32 type) else { UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], mon, HEALTHBOX_ALL); - if (side == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) SetBattlerShadowSpriteCallback(battler, gBattleMons[battler].species); if (type == HANDLE_TYPE_MEGA_EVOLUTION) SetGimmickAsActivated(battler, GIMMICK_MEGA); @@ -10020,13 +10019,13 @@ static void Cmd_various(void) { VARIOUS_ARGS(const u8 *jumpInstr); if (WILD_DOUBLE_BATTLE - && GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER - && GetBattlerSide(gBattlerTarget) == B_SIDE_OPPONENT + && IsOnPlayerSide(gBattlerAttacker) + && !IsOnPlayerSide(gBattlerTarget) && IS_WHOLE_SIDE_ALIVE(gBattlerTarget)) gBattlescriptCurrInstr = cmd->jumpInstr; else if (WILD_DOUBLE_BATTLE - && GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT - && GetBattlerSide(gBattlerTarget) == B_SIDE_OPPONENT) + && !IsOnPlayerSide(gBattlerAttacker) + && !IsOnPlayerSide(gBattlerTarget)) gBattlescriptCurrInstr = cmd->jumpInstr; else if (FlagGet(B_FLAG_NO_RUNNING)) gBattlescriptCurrInstr = cmd->jumpInstr; @@ -10184,7 +10183,7 @@ static void Cmd_various(void) case VARIOUS_UPDATE_NICK: { VARIOUS_ARGS(); - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) mon = GetBattlerMon(battler); else mon = GetBattlerMon(battler); @@ -10493,7 +10492,7 @@ static void Cmd_various(void) VARIOUS_ARGS(); // Don't end the battle if one of the wild mons teleported from the wild double battle // and its partner is still alive. - if (GetBattlerSide(battler) == B_SIDE_OPPONENT && IsBattlerAlive(BATTLE_PARTNER(battler))) + if (!IsOnPlayerSide(battler) && IsBattlerAlive(BATTLE_PARTNER(battler))) { gAbsentBattlerFlags |= 1u << battler; gHitMarker |= HITMARKER_FAINTED(battler); @@ -10502,7 +10501,7 @@ static void Cmd_various(void) SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]); FaintClearSetData(battler); } - else if (GetBattlerSide(battler) == B_SIDE_PLAYER) + else if (IsOnPlayerSide(battler)) { gBattleOutcome = B_OUTCOME_PLAYER_TELEPORTED; } @@ -12597,7 +12596,7 @@ static void Cmd_forcerandomswitch(void) // Red card swaps attacker with target to get the animation correct, so here we check attacker which is really the target. Thanks GF... if (gBattleScripting.switchCase == B_SWITCH_RED_CARD && !(gBattleTypeFlags & BATTLE_TYPE_TRAINER) - && GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) // Check opponent's red card activating + && !IsOnPlayerSide(gBattlerAttacker)) // Check opponent's red card activating { if (!WILD_DOUBLE_BATTLE) { @@ -12627,18 +12626,18 @@ static void Cmd_forcerandomswitch(void) // wild double battle when a player pokemon uses it against its partner if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) || (WILD_DOUBLE_BATTLE - && GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT - && GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER + && !IsOnPlayerSide(gBattlerAttacker) + && IsOnPlayerSide(gBattlerTarget) && IS_WHOLE_SIDE_ALIVE(gBattlerTarget)) || (WILD_DOUBLE_BATTLE - && GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER - && GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + && IsOnPlayerSide(gBattlerAttacker) + && IsOnPlayerSide(gBattlerTarget)) || redCardForcedSwitch ) { party = GetBattlerParty(gBattlerTarget); - if (BATTLE_TWO_VS_ONE_OPPONENT && GetBattlerSide(gBattlerTarget) == B_SIDE_OPPONENT) + if (BATTLE_TWO_VS_ONE_OPPONENT && !IsOnPlayerSide(gBattlerTarget)) { firstMonId = 0; lastMonId = 6; @@ -12680,7 +12679,7 @@ static void Cmd_forcerandomswitch(void) } else if (gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) { - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) { firstMonId = 0; lastMonId = PARTY_SIZE; @@ -12930,7 +12929,7 @@ static void Cmd_tryKO(void) endured = FOCUS_SASHED; RecordItemEffectBattle(gBattlerTarget, holdEffect); } - else if (B_AFFECTION_MECHANICS == TRUE && GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER && affectionScore >= AFFECTION_THREE_HEARTS) + else if (B_AFFECTION_MECHANICS == TRUE && IsOnPlayerSide(gBattlerTarget) && affectionScore >= AFFECTION_THREE_HEARTS) { if ((affectionScore == AFFECTION_FIVE_HEARTS && rand < 20) || (affectionScore == AFFECTION_FOUR_HEARTS && rand < 15) @@ -13742,10 +13741,8 @@ static void Cmd_trysetdestinybond(void) static void TrySetDestinyBondToHappen(void) { - u8 sideAttacker = GetBattlerSide(gBattlerAttacker); - u8 sideTarget = GetBattlerSide(gBattlerTarget); if (gBattleMons[gBattlerTarget].status2 & STATUS2_DESTINY_BOND - && sideAttacker != sideTarget + && !IsBattlerAlly(gBattlerAttacker, gBattlerTarget) && !(gHitMarker & HITMARKER_GRUDGE)) { gHitMarker |= HITMARKER_DESTINYBOND; @@ -14814,7 +14811,7 @@ static void Cmd_tryswapitems(void) // opponent can't swap items with player in regular battles if (gBattleTypeFlags & BATTLE_TYPE_TRAINER_HILL - || (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT + || (!IsOnPlayerSide(gBattlerAttacker) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_FRONTIER @@ -14890,9 +14887,9 @@ static void Cmd_tryswapitems(void) if (!(sideAttacker == sideTarget && IsPartnerMonFromSameTrainer(gBattlerAttacker))) { // if targeting your own side and you aren't in a multi battle, don't save items as stolen - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) TrySaveExchangedItem(gBattlerAttacker, oldItemAtk); - if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerTarget)) TrySaveExchangedItem(gBattlerTarget, *newItemAtk); } @@ -15122,12 +15119,11 @@ static void Cmd_tryimprison(void) } else { - u8 battler, sideAttacker; + u8 battler; - sideAttacker = GetBattlerSide(gBattlerAttacker); for (battler = 0; battler < gBattlersCount; battler++) { - if (sideAttacker != GetBattlerSide(battler)) + if (!IsBattlerAlly(gBattlerAttacker, battler)) { s32 attackerMoveId; for (attackerMoveId = 0; attackerMoveId < MAX_MON_MOVES; attackerMoveId++) @@ -16906,8 +16902,8 @@ u8 GetFirstFaintedPartyIndex(u8 battler) struct Pokemon *party = GetBattlerParty(battler); // Check whether partner is separate trainer. - if ((GetBattlerSide(battler) == B_SIDE_PLAYER && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) - || (GetBattlerSide(battler) == B_SIDE_OPPONENT && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)) + if ((IsOnPlayerSide(battler) && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) + || (!IsOnPlayerSide(battler) && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)) { if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_LEFT || GetBattlerPosition(battler) == B_POSITION_PLAYER_LEFT) @@ -16972,8 +16968,7 @@ void BS_ItemRestoreHP(void) u16 healAmount; u32 battler = MAX_BATTLERS_COUNT; u32 healParam = ItemId_GetEffect(gLastUsedItem)[6]; - u32 side = GetBattlerSide(gBattlerAttacker); - struct Pokemon *party = GetSideParty(side); + struct Pokemon *party = GetBattlerParty(gBattlerAttacker); u16 hp = GetMonData(&party[gBattleStruct->itemPartyIndex[gBattlerAttacker]], MON_DATA_HP); u16 maxHP = GetMonData(&party[gBattleStruct->itemPartyIndex[gBattlerAttacker]], MON_DATA_MAX_HP); gBattleCommunication[MULTIUSE_STATE] = 0; @@ -16985,7 +16980,7 @@ void BS_ItemRestoreHP(void) else { // Track the number of Revives used in a battle. - if (hp == 0 && side == B_SIDE_PLAYER && gBattleResults.numRevivesUsed < 255) + if (hp == 0 && IsOnPlayerSide(gBattlerAttacker) && gBattleResults.numRevivesUsed < 255) gBattleResults.numRevivesUsed++; // Check if the recipient is an active battler. @@ -17043,10 +17038,9 @@ void BS_ItemCureStatus(void) { NATIVE_ARGS(const u8 *noStatusInstr); u32 battler = gBattlerAttacker; - u32 side = GetBattlerSide(gBattlerAttacker); u32 previousStatus2 = 0; bool32 statusChanged = FALSE; - struct Pokemon *party = GetSideParty(side); + struct Pokemon *party = GetBattlerParty(gBattlerAttacker); // Heal Status2 conditions if battler is active. if (gBattleStruct->itemPartyIndex[gBattlerAttacker] == gBattlerPartyIndexes[gBattlerAttacker]) @@ -17102,7 +17096,7 @@ void BS_ItemRestorePP(void) const u8 *effect = ItemId_GetEffect(gLastUsedItem); u32 i, pp, maxPP, moveId, loopEnd; u32 battler = MAX_BATTLERS_COUNT; - struct Pokemon *mon = (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) ? &gPlayerParty[gBattleStruct->itemPartyIndex[gBattlerAttacker]] : &gEnemyParty[gBattleStruct->itemPartyIndex[gBattlerAttacker]]; + struct Pokemon *mon = (IsOnPlayerSide(gBattlerAttacker)) ? &gPlayerParty[gBattleStruct->itemPartyIndex[gBattlerAttacker]] : &gEnemyParty[gBattleStruct->itemPartyIndex[gBattlerAttacker]]; // Check whether to apply to all moves. if (effect[4] & ITEM4_HEAL_PP_ONE) @@ -17709,7 +17703,7 @@ static void TryUpdateEvolutionTracker(u32 evolutionCondition, u32 upAmount, u16 { u32 i, j; - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER + if (IsOnPlayerSide(gBattlerAttacker) && !(gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK @@ -18097,7 +18091,6 @@ void BS_StoreHealingWish(void) void BS_TryRevivalBlessing(void) { NATIVE_ARGS(const u8 *failInstr); - u32 side = GetBattlerSide(gBattlerAttacker); u8 index = GetFirstFaintedPartyIndex(gBattlerAttacker); // Move fails if there are no battlers to revive. @@ -18110,7 +18103,7 @@ void BS_TryRevivalBlessing(void) // Battler selected! Revive and go to next instruction. if (gSelectedMonPartyId != PARTY_SIZE) { - struct Pokemon *party = GetSideParty(side); + struct Pokemon *party = GetBattlerParty(gBattlerAttacker); u16 hp = GetMonData(&party[gSelectedMonPartyId], MON_DATA_MAX_HP) / 2; BtlController_EmitSetMonData(gBattlerAttacker, BUFFER_A, REQUEST_HP_BATTLE, 1u << gSelectedMonPartyId, sizeof(hp), &hp); diff --git a/src/battle_terastal.c b/src/battle_terastal.c index fb7ca10f28..942d761c2b 100644 --- a/src/battle_terastal.c +++ b/src/battle_terastal.c @@ -20,8 +20,6 @@ // Sets flags and variables upon a battler's Terastallization. void ActivateTera(u32 battler) { - u32 side = GetBattlerSide(battler); - // Set appropriate flags. SetActiveGimmick(battler, GIMMICK_TERA); SetGimmickAsActivated(battler, GIMMICK_TERA); @@ -29,7 +27,7 @@ void ActivateTera(u32 battler) // Remove Tera Orb charge. if (B_FLAG_TERA_ORB_CHARGED != 0 && (B_FLAG_TERA_ORB_NO_COST == 0 || !FlagGet(B_FLAG_TERA_ORB_NO_COST)) - && side == B_SIDE_PLAYER + && IsOnPlayerSide(battler) && !(IsDoubleBattle() && !IsPartnerMonFromSameTrainer(battler))) { FlagClear(B_FLAG_TERA_ORB_CHARGED); @@ -70,10 +68,10 @@ bool32 CanTerastallize(u32 battler) return FALSE; // Prevents Zigzagoon from terastalizing in vanilla. - if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (gBattleTypeFlags & BATTLE_TYPE_FIRST_BATTLE && !IsOnPlayerSide(battler)) return FALSE; - if (TESTING || GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (TESTING || !IsOnPlayerSide(battler)) { // Skip all other checks in this block, go to HasTrainerUsedGimmick } diff --git a/src/battle_tv.c b/src/battle_tv.c index 12b8dd92b1..0758bf4107 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -1220,7 +1220,7 @@ static void TrySetBattleSeminarShow(void) if (gBattleTypeFlags & (BATTLE_TYPE_DOUBLE | BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return; - else if (GetBattlerSide(gBattlerAttacker) == B_SIDE_OPPONENT) + else if (!IsOnPlayerSide(gBattlerAttacker)) return; else if (gBattleMons[gBattlerAttacker].statStages[STAT_ACC] < DEFAULT_STAT_STAGE) return; diff --git a/src/battle_util.c b/src/battle_util.c index ad37c5f0f9..1c5273bf25 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -429,7 +429,7 @@ void HandleAction_UseMove(void) if (IsBattlerAlive(gBattlerAttacker)) { - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) gBattleResults.lastUsedMovePlayer = gCurrentMove; else gBattleResults.lastUsedMoveOpponent = gCurrentMove; @@ -678,7 +678,7 @@ void HandleAction_Run(void) for (i = 0; i < gBattlersCount; i++) { - if (GetBattlerSide(i) == B_SIDE_PLAYER) + if (IsOnPlayerSide(i)) { if (gChosenActionByBattler[i] == B_ACTION_RUN) gBattleOutcome |= B_OUTCOME_LOST; @@ -695,7 +695,7 @@ void HandleAction_Run(void) } else { - if (GetBattlerSide(gBattlerAttacker) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattlerAttacker)) { if (!TryRunFromBattle(gBattlerAttacker)) // failed to run away { @@ -1216,7 +1216,7 @@ void OpponentSwitchInResetSentPokesToOpponentValue(u32 battler) s32 i = 0; u32 bits = 0; - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) { u8 flank = ((battler & BIT_FLANK) >> 1); gSentPokesToOpponent[flank] = 0; @@ -1232,7 +1232,7 @@ void OpponentSwitchInResetSentPokesToOpponentValue(u32 battler) void UpdateSentPokesToOpponentValue(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) { OpponentSwitchInResetSentPokesToOpponentValue(battler); } @@ -1645,11 +1645,10 @@ u8 GetImprisonedMovesCount(u32 battler, u16 move) u32 GetBattlerAffectionHearts(u32 battler) { - u8 side = GetBattlerSide(battler); struct Pokemon *mon = GetBattlerMon(battler); u16 species = GetMonData(mon, MON_DATA_SPECIES); - if (side != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) return AFFECTION_NO_HEARTS; else if (gSpeciesInfo[species].isMegaEvolution || (gBattleTypeFlags & (BATTLE_TYPE_EREADER_TRAINER @@ -2488,7 +2487,7 @@ static void CancellerMultiTargetMoves(u32 *effect) { for (u32 battlerDef = 0; battlerDef < gBattlersCount; battlerDef++) { - if (gBattleStruct->bouncedMoveIsUsed && B_SIDE_OPPONENT == GetBattlerSide(battlerDef)) + if (gBattleStruct->bouncedMoveIsUsed && !IsOnPlayerSide(battlerDef)) continue; u32 abilityDef = GetBattlerAbility(battlerDef); @@ -2579,15 +2578,15 @@ u32 AtkCanceller_MoveSuccessOrder(void) bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2) { - u32 i, side, playerId, flankId; + u32 i, playerId, flankId; struct Pokemon *party; if (!IsDoubleBattle()) return FALSE; - side = GetBattlerSide(battler); + bool32 isPlayerside = IsOnPlayerSide(battler); - if (BATTLE_TWO_VS_ONE_OPPONENT && side == B_SIDE_OPPONENT) + if (BATTLE_TWO_VS_ONE_OPPONENT && !isPlayerside) { flankId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); playerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); @@ -2625,7 +2624,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2 else if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) { party = GetBattlerParty(battler); - if (side == B_SIDE_OPPONENT && WILD_DOUBLE_BATTLE) + if (!isPlayerside && WILD_DOUBLE_BATTLE) { flankId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); playerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); @@ -2659,7 +2658,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2 { if (gBattleTypeFlags & BATTLE_TYPE_TOWER_LINK_MULTI) { - if (side == B_SIDE_PLAYER) + if (isPlayerside) { party = gPlayerParty; flankId = GetBattlerMultiplayerId(battler); @@ -2688,7 +2687,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2 } return (i == playerId * MULTI_PARTY_SIZE + MULTI_PARTY_SIZE); } - else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && side == B_SIDE_OPPONENT) + else if ((gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) && !isPlayerside) { party = gEnemyParty; @@ -2706,7 +2705,7 @@ bool32 HasNoMonsToSwitch(u32 battler, u8 partyIdBattlerOn1, u8 partyIdBattlerOn2 } else { - if (side == B_SIDE_OPPONENT) + if (!isPlayerside) { flankId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); playerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); @@ -3621,11 +3620,9 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32 case ABILITY_ANTICIPATION: if (!gSpecialStatuses[battler].switchInAbilityDone) { - u32 side = GetBattlerSide(battler); - for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (IsBattlerAlive(i) && side != GetBattlerSide(i)) + if (IsBattlerAlive(i) && !IsBattlerAlly(i, battler)) { for (j = 0; j < MAX_MON_MOVES; j++) { @@ -6653,7 +6650,7 @@ u32 ItemBattleEffects(enum ItemCaseId caseID, u32 battler, bool32 moveTurn) switch (battlerHoldEffect) { case HOLD_EFFECT_DOUBLE_PRIZE: - if (GetBattlerSide(battler) == B_SIDE_PLAYER && !gBattleStruct->moneyMultiplierItem) + if (IsOnPlayerSide(battler) && !gBattleStruct->moneyMultiplierItem) { gBattleStruct->moneyMultiplier *= 2; gBattleStruct->moneyMultiplierItem = 1; @@ -9556,7 +9553,7 @@ static inline s32 DoFutureSightAttackDamageCalcVars(struct DamageCalculationData u32 move = damageCalcData->move; u32 moveType = damageCalcData->moveType; - struct Pokemon *party = GetSideParty(GetBattlerSide(battlerAtk)); + struct Pokemon *party = GetBattlerParty(battlerAtk); struct Pokemon *partyMon = &party[gWishFutureKnock.futureSightPartyIndex[battlerDef]]; u32 partyMonLevel = GetMonData(partyMon, MON_DATA_LEVEL, NULL); u32 partyMonSpecies = GetMonData(partyMon, MON_DATA_SPECIES, NULL); @@ -9617,7 +9614,7 @@ static u32 GetWeather(void) bool32 IsFutureSightAttackerInParty(u32 battlerAtk, u32 battlerDef) { - struct Pokemon *party = GetSideParty(GetBattlerSide(battlerAtk)); + struct Pokemon *party = GetBattlerParty(battlerAtk); return &party[gWishFutureKnock.futureSightPartyIndex[battlerDef]] != &party[gBattlerPartyIndexes[battlerAtk]] && &party[gWishFutureKnock.futureSightPartyIndex[battlerDef]] != &party[BATTLE_PARTNER(gBattlerPartyIndexes[battlerAtk])]; } @@ -9965,9 +9962,9 @@ s32 GetStealthHazardDamage(enum TypeSideHazard hazardType, u32 battler) bool32 IsPartnerMonFromSameTrainer(u32 battler) { - if (GetBattlerSide(battler) == B_SIDE_OPPONENT && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) + if (!IsOnPlayerSide(battler) && gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) return FALSE; - else if (GetBattlerSide(battler) == B_SIDE_PLAYER && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) + else if (IsOnPlayerSide(battler) && gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) return FALSE; else if (gBattleTypeFlags & BATTLE_TYPE_MULTI) return FALSE; @@ -10374,7 +10371,7 @@ struct Pokemon *GetIllusionMonPtr(u32 battler) { if (gBattleStruct->illusion[battler].state == ILLUSION_NOT_SET) { - if (GetBattlerSide(battler) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battler)) SetIllusionMon(GetBattlerMon(battler), battler); else SetIllusionMon(GetBattlerMon(battler), battler); @@ -10453,7 +10450,7 @@ bool32 ShouldGetStatBadgeBoost(u16 badgeFlag, u32 battler) { if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_EREADER_TRAINER | BATTLE_TYPE_RECORDED_LINK | BATTLE_TYPE_FRONTIER)) return FALSE; - else if (GetBattlerSide(battler) != B_SIDE_PLAYER) + else if (!IsOnPlayerSide(battler)) return FALSE; else if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && TRAINER_BATTLE_PARAM.opponentA == TRAINER_SECRET_BASE) return FALSE; @@ -10724,7 +10721,7 @@ void TrySaveExchangedItem(u32 battler, u16 stolenItem) // If regular trainer battle and mon's original item matches what is being stolen, save it to be restored at end of battle if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && !(gBattleTypeFlags & BATTLE_TYPE_FRONTIER) - && GetBattlerSide(battler) == B_SIDE_PLAYER + && IsOnPlayerSide(battler) && stolenItem == gBattleStruct->itemLost[B_SIDE_PLAYER][gBattlerPartyIndexes[battler]].originalItem) gBattleStruct->itemLost[B_SIDE_PLAYER][gBattlerPartyIndexes[battler]].stolen = TRUE; } diff --git a/src/battle_util2.c b/src/battle_util2.c index f7e6f4a0c0..61684ff535 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -110,7 +110,7 @@ void AdjustFriendshipOnBattleFaint(u8 battler) void SwitchPartyOrderInGameMulti(u8 battler, u8 arg1) { - if (GetBattlerSide(battler) != B_SIDE_OPPONENT) + if (IsOnPlayerSide(battler)) { s32 i; for (i = 0; i < (int)ARRAY_COUNT(gBattlePartyCurrentOrder); i++) diff --git a/src/party_menu.c b/src/party_menu.c index 891a9ca041..23f04df2c7 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -7304,7 +7304,7 @@ static bool8 TrySwitchInPokemon(void) } for (i = 0; i < gBattlersCount; i++) { - if (GetBattlerSide(i) == B_SIDE_PLAYER && GetPartyIdFromBattleSlot(slot) == gBattlerPartyIndexes[i]) + if (IsOnPlayerSide(i) && GetPartyIdFromBattleSlot(slot) == gBattlerPartyIndexes[i]) { GetMonNickname(&gPlayerParty[slot], gStringVar1); StringExpandPlaceholders(gStringVar4, gText_PkmnAlreadyInBattle); @@ -7406,7 +7406,7 @@ void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 flankId) BufferBattlePartyOrderBySide(gBattleStruct->battlerPartyOrders[battlerId], flankId, battlerId); } -// when GetBattlerSide(battlerId) == B_SIDE_PLAYER, this function is identical the one above +// when IsOnPlayerSide(battlerId), this function is identical the one above static void BufferBattlePartyOrderBySide(u8 *partyBattleOrder, u8 flankId, u8 battlerId) { u8 partyIndexes[PARTY_SIZE]; @@ -7414,7 +7414,7 @@ static void BufferBattlePartyOrderBySide(u8 *partyBattleOrder, u8 flankId, u8 ba u8 leftBattler; u8 rightBattler; - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) { leftBattler = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT); rightBattler = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT); diff --git a/src/pokeball.c b/src/pokeball.c index 03384b2e57..2b893aa060 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -994,7 +994,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) u8 taskId; mon = GetBattlerMon(battlerId); - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battlerId)) pan = 25; else pan = -25; @@ -1041,7 +1041,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite) StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[sprite->sBattler]], BATTLER_AFFINE_EMERGE); - if (GetBattlerSide(sprite->sBattler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(sprite->sBattler)) gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCB_OpponentMonFromBall; else gSprites[gBattlerSpriteIds[sprite->sBattler]].callback = SpriteCB_PlayerMonFromBall; @@ -1491,7 +1491,7 @@ void StartHealthboxSlideIn(u8 battlerId) healthboxSprite->x2 = 0x73; healthboxSprite->y2 = 0; healthboxSprite->callback = SpriteCB_HealthboxSlideIn; - if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battlerId)) { healthboxSprite->sSpeedX = -healthboxSprite->sSpeedX; healthboxSprite->sSpeedY = -healthboxSprite->sSpeedY; diff --git a/src/pokemon.c b/src/pokemon.c index 0471a0ee44..7d9f59414f 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -1663,7 +1663,7 @@ bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId) } else { - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) return FALSE; } } @@ -1671,7 +1671,7 @@ bool8 ShouldIgnoreDeoxysForm(u8 caseId, u8 battlerId) { if (!gMain.inBattle) return FALSE; - if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) + if (IsOnPlayerSide(battlerId)) return FALSE; } break; @@ -2098,7 +2098,6 @@ void DeleteFirstMoveAndGiveMoveToBoxMon(struct BoxPokemon *boxMon, u16 move) u8 CountAliveMonsInBattle(u8 caseId, u32 battler) { u32 i; - u32 battlerSide; u32 retVal = 0; switch (caseId) @@ -2118,10 +2117,9 @@ u8 CountAliveMonsInBattle(u8 caseId, u32 battler) } break; case BATTLE_ALIVE_SIDE: - battlerSide = GetBattlerSide(battler); for (i = 0; i < MAX_BATTLERS_COUNT; i++) { - if (GetBattlerSide(i) == battlerSide && !(gAbsentBattlerFlags & (1u << i))) + if (IsBattlerAlly(i, battler) && !(gAbsentBattlerFlags & (1u << i))) retVal++; } break; @@ -6054,7 +6052,7 @@ void SetMonPreventsSwitchingString(void) gBattleTextBuff1[2] = gBattleStruct->battlerPreventingSwitchout; gBattleTextBuff1[4] = B_BUFF_EOS; - if (GetBattlerSide(gBattleStruct->battlerPreventingSwitchout) == B_SIDE_PLAYER) + if (IsOnPlayerSide(gBattleStruct->battlerPreventingSwitchout)) gBattleTextBuff1[3] = GetPartyIdFromBattlePartyId(gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]); else gBattleTextBuff1[3] = gBattlerPartyIndexes[gBattleStruct->battlerPreventingSwitchout]; diff --git a/src/recorded_battle.c b/src/recorded_battle.c index 5f30cbdde9..e93b93ac7b 100644 --- a/src/recorded_battle.c +++ b/src/recorded_battle.c @@ -666,7 +666,7 @@ void RecordedBattle_CopyBattlerMoves(u32 battler) { s32 i; - if (GetBattlerSide(battler) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(battler)) return; if (gBattleTypeFlags & (BATTLE_TYPE_LINK | BATTLE_TYPE_RECORDED_LINK)) return; @@ -691,7 +691,7 @@ void RecordedBattle_CheckMovesetChanges(u8 mode) for (battlerId = 0; battlerId < gBattlersCount; battlerId++) { // Player's side only - if (GetBattlerSide(battlerId) != B_SIDE_OPPONENT) + if (IsOnPlayerSide(battlerId)) { if (mode == B_RECORD_MODE_RECORDING) { diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c index 5a3e172c69..d46ef692cc 100644 --- a/src/reshow_battle_screen.c +++ b/src/reshow_battle_screen.c @@ -268,7 +268,7 @@ static bool8 LoadBattlerSpriteGfx(u32 battler) { if (battler < gBattlersCount) { - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler); @@ -300,7 +300,7 @@ void CreateBattlerSprite(u32 battler) else posY = GetBattlerSpriteDefault_Y(battler); - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { if (GetMonData(GetBattlerMon(battler), MON_DATA_HP) == 0) return; @@ -372,7 +372,7 @@ static void CreateHealthboxSprite(u32 battler) InitBattlerHealthboxCoords(battler); SetHealthboxSpriteVisible(healthboxSpriteId); - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL); else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_SAFARI_ALL_TEXT); @@ -384,7 +384,7 @@ static void CreateHealthboxSprite(u32 battler) else DummyBattleInterfaceFunc(gHealthboxSpriteIds[battler], FALSE); - if (GetBattlerSide(battler) != B_SIDE_PLAYER) + if (!IsOnPlayerSide(battler)) { if (GetMonData(GetBattlerMon(battler), MON_DATA_HP) == 0) SetHealthboxSpriteInvisible(healthboxSpriteId); diff --git a/src/trainer_slide.c b/src/trainer_slide.c index 209f47f0c3..3b94894a79 100644 --- a/src/trainer_slide.c +++ b/src/trainer_slide.c @@ -240,7 +240,7 @@ enum TrainerSlideTargets ShouldDoTrainerSlide(u32 battler, enum TrainerSlideType u32 retValue = TRAINER_SLIDE_TARGET_TRAINER_A; bool32 shouldRun = FALSE; - if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) || GetBattlerSide(battler) != B_SIDE_OPPONENT) + if (!(gBattleTypeFlags & BATTLE_TYPE_TRAINER) || IsOnPlayerSide(battler)) return TRAINER_SLIDE_TARGET_NONE; SetTrainerSlideParamters(battler, &firstId, &lastId, &trainerId, &retValue); @@ -319,7 +319,7 @@ void TryInitializeFirstSTABMoveTrainerSlide(u32 battlerDef, u32 battlerAtk, u32 if (IsSlideInitalizedOrPlayed(slideId)) return; - if ((GetBattlerSide(battlerDef) == B_SIDE_PLAYER)) + if ((IsOnPlayerSide(battlerDef))) return; if (IS_BATTLER_OF_TYPE(battlerAtk, moveType) == FALSE) @@ -335,7 +335,7 @@ void TryInitializeTrainerSlidePlayerLandsFirstCriticalHit(u32 target) if (IsSlideInitalizedOrPlayed(slideId)) return; - if (GetBattlerSide(target) == B_SIDE_PLAYER) + if (IsOnPlayerSide(target)) return; InitalizeTrainerSlide(slideId); @@ -348,7 +348,7 @@ void TryInitializeTrainerSlideEnemyLandsFirstCriticalHit(u32 target) if (IsSlideInitalizedOrPlayed(slideId)) return; - if (GetBattlerSide(target) == B_SIDE_OPPONENT) + if (!IsOnPlayerSide(target)) return; InitalizeTrainerSlide(slideId); @@ -361,7 +361,7 @@ void TryInitializeTrainerSlidePlayerLandsFirstSuperEffectiveHit(u32 target) if (IsSlideInitalizedOrPlayed(slideId)) return; - if (GetBattlerSide(target) == B_SIDE_PLAYER) + if (IsOnPlayerSide(target)) return; InitalizeTrainerSlide(slideId); @@ -374,7 +374,7 @@ void TryInitializeTrainerSlideEnemyMonUnaffected(u32 target) if (IsSlideInitalizedOrPlayed(slideId)) return; - if (GetBattlerSide(target) != B_SIDE_OPPONENT) + if (IsOnPlayerSide(target)) return; InitalizeTrainerSlide(slideId);