Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-04-25 15:57:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Review changes

Browse Source
This commit is contained in:
Eduardo Quezada 2025-05-12 20:53:14 -04:00
parent 13071f7019
commit 3b6dbf38fd
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/battle.h
View File

@ -1198,12 +1198,12 @@ static inline u32 GetBattlerSide(u32 battler)
static inline u32 IsOnPlayerSide(u32 battler) static inline u32 IsOnPlayerSide(u32 battler)
{ {
return (GetBattlerSide(battler) == B_SIDE_PLAYER); return GetBattlerSide(battler) == B_SIDE_PLAYER;
} }
static inline bool32 IsBattlerAlly(u32 battlerAtk, u32 battlerDef) static inline bool32 IsBattlerAlly(u32 battlerAtk, u32 battlerDef)
{ {
return (GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef)); return GetBattlerSide(battlerAtk) == GetBattlerSide(battlerDef);
} }
static inline u32 GetOpposingSideBattler(u32 battler) static inline u32 GetOpposingSideBattler(u32 battler)
@ -1214,12 +1214,12 @@ static inline u32 GetOpposingSideBattler(u32 battler)
static inline struct Pokemon* GetBattlerMon(u32 battler) static inline struct Pokemon* GetBattlerMon(u32 battler)
{ {
u32 index = gBattlerPartyIndexes[battler]; u32 index = gBattlerPartyIndexes[battler];
return (!IsOnPlayerSide(battler)) ? &gEnemyParty[index] : &gPlayerParty[index]; return !IsOnPlayerSide(battler) ? &gEnemyParty[index] : &gPlayerParty[index];
} }
static inline struct Pokemon *GetSideParty(u32 side) static inline struct Pokemon *GetSideParty(u32 side)
{ {
return (side == B_SIDE_PLAYER) ? gPlayerParty : gEnemyParty; return side == B_SIDE_PLAYER ? gPlayerParty : gEnemyParty;
} }
static inline struct Pokemon *GetBattlerParty(u32 battler) static inline struct Pokemon *GetBattlerParty(u32 battler)

2
src/battle_anim_water.c
View File

@ -1552,7 +1552,7 @@ void AnimTask_WaterSport(u8 taskId)
task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2); task->data[3] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_X_2);
task->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET); task->data[4] = GetBattlerSpriteCoord(gBattleAnimAttacker, BATTLER_COORD_Y_PIC_OFFSET);
task->data[7] = (IsOnPlayerSide(gBattleAnimAttacker)) ? 1 : -1; task->data[7] = IsOnPlayerSide(gBattleAnimAttacker) ? 1 : -1;
if (IsContest()) if (IsContest())
task->data[7] *= -1; task->data[7] *= -1;
task->data[5] = task->data[3] + task->data[7] * 8; task->data[5] = task->data[3] + task->data[7] * 8;

4
src/battle_controllers.c
View File

@ -2163,7 +2163,7 @@ static void Controller_ReturnMonToBall(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].specialAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[battler].specialAnimActive)
{ {
gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0;
InitAndLaunchSpecialAnimation(battler, battler, battler, (!IsOnPlayerSide(battler)) ? 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; gBattlerControllerFuncs[battler] = Controller_ReturnMonToBall2;
} }
break; break;
@ -2767,7 +2767,7 @@ void BtlController_HandleHitAnimation(u32 battler)
void BtlController_HandlePlaySE(u32 battler) void BtlController_HandlePlaySE(u32 battler)
{ {
s8 pan = (IsOnPlayerSide(battler)) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET; s32 pan = IsOnPlayerSide(battler) ? SOUND_PAN_ATTACKER : SOUND_PAN_TARGET;
PlaySE12WithPanning(gBattleResources->bufferA[battler][1] | (gBattleResources->bufferA[battler][2] << 8), pan); PlaySE12WithPanning(gBattleResources->bufferA[battler][1] | (gBattleResources->bufferA[battler][2] << 8), pan);
BattleControllerComplete(battler); BattleControllerComplete(battler);

4
src/battle_gfx_sfx_util.c
View File

@ -642,7 +642,7 @@ void BattleLoadMonSpriteGfx(struct Pokemon *mon, u32 battler)
} }
position = GetBattlerPosition(battler); position = GetBattlerPosition(battler);
HandleLoadSpecialPokePic((!IsOnPlayerSide(battler)), HandleLoadSpecialPokePic(!IsOnPlayerSide(battler),
gMonSpritesGfxPtr->spritesGfx[position], gMonSpritesGfxPtr->spritesGfx[position],
species, personalityValue); species, personalityValue);
@ -970,7 +970,7 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bo
} }
} }
HandleLoadSpecialPokePic((!IsOnPlayerSide(battlerAtk)), HandleLoadSpecialPokePic(!IsOnPlayerSide(battlerAtk),
gMonSpritesGfxPtr->spritesGfx[position], gMonSpritesGfxPtr->spritesGfx[position],
targetSpecies, targetSpecies,
personalityValue); personalityValue);

6
src/pokemon.c
View File

@ -2103,21 +2103,21 @@ u8 CountAliveMonsInBattle(u8 caseId, u32 battler)
switch (caseId) switch (caseId)
{ {
case BATTLE_ALIVE_EXCEPT_BATTLER: case BATTLE_ALIVE_EXCEPT_BATTLER:
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < gBattlersCount; i++)
{ {
if (i != battler && !(gAbsentBattlerFlags & (1u << i))) if (i != battler && !(gAbsentBattlerFlags & (1u << i)))
retVal++; retVal++;
} }
break; break;
case BATTLE_ALIVE_EXCEPT_BATTLER_SIDE: case BATTLE_ALIVE_EXCEPT_BATTLER_SIDE:
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < gBattlersCount; i++)
{ {
if (i != battler && i != BATTLE_PARTNER(battler) && !(gAbsentBattlerFlags & (1u << i))) if (i != battler && i != BATTLE_PARTNER(battler) && !(gAbsentBattlerFlags & (1u << i)))
retVal++; retVal++;
} }
break; break;
case BATTLE_ALIVE_SIDE: case BATTLE_ALIVE_SIDE:
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < gBattlersCount; i++)
{ {
if (IsBattlerAlly(i, battler) && !(gAbsentBattlerFlags & (1u << i))) if (IsBattlerAlly(i, battler) && !(gAbsentBattlerFlags & (1u << i)))
retVal++; retVal++;