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

GetBattleTrainer -> GetBattlerTrainer (#8952)

Browse Source
This commit is contained in:
Eduardo Quezada 2026-01-18 05:08:33 -03:00 committed by GitHub
parent 925d929c06
commit 258cc08533
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_controllers.h
View File

@ -464,6 +464,6 @@ void BtlController_HandleSwitchInShowSubstitute(u32 battler);
bool32 ShouldBattleRestrictionsApply(u32 battler);
void FreeShinyStars(void);
enum BattleTrainer GetBattleTrainer(enum BattlerId battler);
enum BattleTrainer GetBattlerTrainer(enum BattlerId battler);
#endif // GUARD_BATTLE_CONTROLLERS_H

4
src/battle_controllers.c
View File

@ -1482,7 +1482,7 @@ static u32 GetBattlerMonData(u32 battler, struct Pokemon *party, u32 monId, u8 *
#if TESTING
if (gTestRunnerEnabled)
{
enum BattleTrainer trainer = GetBattleTrainer(battler);
enum BattleTrainer trainer = GetBattlerTrainer(battler);
u32 partyIndex = gBattlerPartyIndexes[battler];
if (TestRunner_Battle_GetForcedAbility(trainer, partyIndex))
gBattleMons[battler].ability = TestRunner_Battle_GetForcedAbility(trainer, partyIndex);
@ -3247,7 +3247,7 @@ void FreeShinyStars(void)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
}
enum BattleTrainer GetBattleTrainer(enum BattlerId battler)
enum BattleTrainer GetBattlerTrainer(enum BattlerId battler)
{
switch (battler)
{

2
src/battle_gimmick.c
View File

@ -68,7 +68,7 @@ bool32 ShouldTrainerBattlerUseGimmick(u32 battler, enum Gimmick gimmick)
// There are no trainer party settings in battles, but the AI needs to know which gimmick to use.
if (TESTING)
{
return gimmick == TestRunner_Battle_GetChosenGimmick(GetBattleTrainer(battler), gBattlerPartyIndexes[battler]);
return gimmick == TestRunner_Battle_GetChosenGimmick(GetBattlerTrainer(battler), gBattlerPartyIndexes[battler]);
}
// The player can bypass these checks because they can choose through the controller.
else if (IsOnPlayerSide(battler)

6
src/battle_main.c
View File

@ -3256,7 +3256,7 @@ void SwitchInClearSetData(u32 battler, struct Volatiles *volatilesCopy)
#if TESTING
if (gTestRunnerEnabled)
{
enum BattleTrainer trainer = GetBattleTrainer(battler);
enum BattleTrainer trainer = GetBattlerTrainer(battler);
u32 partyIndex = gBattlerPartyIndexes[battler];
if (TestRunner_Battle_GetForcedAbility(trainer, partyIndex))
gBattleMons[i].ability = TestRunner_Battle_GetForcedAbility(trainer, partyIndex);
@ -3461,7 +3461,7 @@ static void DoBattleIntro(void)
#if TESTING
if (gTestRunnerEnabled)
{
enum BattleTrainer trainer = GetBattleTrainer(battler);
enum BattleTrainer trainer = GetBattlerTrainer(battler);
u32 partyIndex = gBattlerPartyIndexes[battler];
if (TestRunner_Battle_GetForcedAbility(trainer, partyIndex))
gBattleMons[battler].ability = TestRunner_Battle_GetForcedAbility(trainer, partyIndex);
@ -3758,7 +3758,7 @@ static void TryDoEventsBeforeFirstTurn(void)
{
for (i = 0; i < gBattlersCount; ++i)
{
enum BattleTrainer trainer = GetBattleTrainer(i);
enum BattleTrainer trainer = GetBattlerTrainer(i);
u32 partyIndex = gBattlerPartyIndexes[i];
if (TestRunner_Battle_GetForcedAbility(trainer, partyIndex))
gBattleMons[i].ability = TestRunner_Battle_GetForcedAbility(trainer, partyIndex);

4
src/battle_script_commands.c
View File

@ -5229,7 +5229,7 @@ static void Cmd_switchindataupdate(void)
#if TESTING
if (gTestRunnerEnabled)
{
enum BattleTrainer trainer = GetBattleTrainer(battler);
enum BattleTrainer trainer = GetBattlerTrainer(battler);
u32 partyIndex = gBattlerPartyIndexes[battler];
if (TestRunner_Battle_GetForcedAbility(trainer, partyIndex))
gBattleMons[battler].ability = TestRunner_Battle_GetForcedAbility(trainer, partyIndex);
@ -9309,7 +9309,7 @@ static void Cmd_healpartystatus(void)
#if TESTING
if (gTestRunnerEnabled)
{
enum BattleTrainer trainer = GetBattleTrainer(gBattlerAttacker);
enum BattleTrainer trainer = GetBattlerTrainer(gBattlerAttacker);
if (TestRunner_Battle_GetForcedAbility(trainer, i))
ability = TestRunner_Battle_GetForcedAbility(trainer, i);
}

12
test/test_runner_battle.c
View File

@ -2157,13 +2157,13 @@ void ClosePokemon(u32 sourceLine)
static void SetGimmick(u32 sourceLine, u32 battler, u32 partyIndex, enum Gimmick gimmick)
{
enum Gimmick currentGimmick = DATA.chosenGimmick[GetBattleTrainer(battler)][partyIndex];
enum Gimmick currentGimmick = DATA.chosenGimmick[GetBattlerTrainer(battler)][partyIndex];
if (!((currentGimmick == GIMMICK_ULTRA_BURST && gimmick == GIMMICK_Z_MOVE)
|| (currentGimmick == GIMMICK_Z_MOVE && gimmick == GIMMICK_ULTRA_BURST)))
{
INVALID_IF(currentGimmick != GIMMICK_NONE && currentGimmick != gimmick, "Cannot set %s because %s already set", sGimmickIdentifiers[gimmick], sGimmickIdentifiers[currentGimmick]);
}
DATA.chosenGimmick[GetBattleTrainer(battler)][partyIndex] = gimmick;
DATA.chosenGimmick[GetBattlerTrainer(battler)][partyIndex] = gimmick;
}
void Gender_(u32 sourceLine, u32 gender)
@ -2666,9 +2666,9 @@ s32 MoveGetTarget(s32 battlerId, enum Move moveId, struct MoveContext *ctx, u32
target = BATTLE_OPPOSITE(battlerId);
}
else if (moveTarget == TARGET_USER
|| moveTarget == TARGET_ALL_BATTLERS
|| moveTarget == TARGET_FIELD
else if (moveTarget == TARGET_USER
|| moveTarget == TARGET_ALL_BATTLERS
|| moveTarget == TARGET_FIELD
|| moveTarget == TARGET_USER_AND_ALLY)
{
target = battlerId;
@ -3066,7 +3066,7 @@ void ExpectSwitch(u32 sourceLine, struct BattlePokemon *battler, u32 partyIndex)
DATA.expectedAiActions[battlerId][id].sourceLine = sourceLine;
DATA.expectedAiActions[battlerId][id].actionSet = TRUE;
DATA.expectedAiActionIndex[battlerId]++;
if (gTestRunnerState.expectedFailState == EXPECT_FAIL_OPEN)
gTestRunnerState.expectedFailState = EXPECT_FAIL_TURN_OPEN;
}