Skip to content

Commit f1e8be9

Browse files
AlexOn1ineAlexOn1ine
committed
Rename battlerId to battler for consistency
1 parent 66c07f9 commit f1e8be9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1355
-1354
lines changed

‎include/battle.h‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -465,11 +465,11 @@ STATIC_ASSERT(sizeof(((struct BattleStruct *)0)->palaceFlags) * 8 >= MAX_BATTLER
465465

466466
#define TARGET_TURN_DAMAGED ((gSpecialStatuses[gBattlerTarget].physicalDmg != 0 || gSpecialStatuses[gBattlerTarget].specialDmg != 0))
467467

468-
#define IS_BATTLER_OF_TYPE(battlerId, type) ((gBattleMons[battlerId].types[0] == type || gBattleMons[battlerId].types[1] == type))
469-
#define SET_BATTLER_TYPE(battlerId, type) \
468+
#define IS_BATTLER_OF_TYPE(battler, type) ((gBattleMons[battler].types[0] == type || gBattleMons[battler].types[1] == type))
469+
#define SET_BATTLER_TYPE(battler, type) \
470470
{ \
471-
gBattleMons[battlerId].types[0] = type; \
472-
gBattleMons[battlerId].types[1] = type; \
471+
gBattleMons[battler].types[0] = type; \
472+
gBattleMons[battler].types[1] = type; \
473473
}
474474

475475
#define GET_STAT_BUFF_ID(n) ((n & 0xF)) // first four bits 0x1, 0x2, 0x4, 0x8

‎include/battle_ai_script_commands.h‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves);
1010
void BattleAI_SetupAIData(u8 defaultScoreMoves);
1111
u8 BattleAI_ChooseMoveOrAction(void);
12-
void ClearBattlerMoveHistory(u8 battlerId);
13-
void RecordAbilityBattle(u8 battlerId, u8 abilityId);
14-
void ClearBattlerAbilityHistory(u8 battlerId);
15-
void RecordItemEffectBattle(u8 battlerId, u8 itemEffect);
16-
void ClearBattlerItemEffectHistory(u8 battlerId);
12+
void ClearBattlerMoveHistory(u8 battler);
13+
void RecordAbilityBattle(u8 battler, u8 abilityId);
14+
void ClearBattlerAbilityHistory(u8 battler);
15+
void RecordItemEffectBattle(u8 battler, u8 itemEffect);
16+
void ClearBattlerItemEffectHistory(u8 battler);
1717

1818
#endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H

‎include/battle_anim.h‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,8 +57,8 @@ void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMo
5757
void DestroyAnimSprite(struct Sprite *sprite);
5858
void DestroyAnimVisualTask(u8 taskId);
5959
void DestroyAnimSoundTask(u8 taskId);
60-
bool8 IsBattlerSpriteVisible(u8 battlerId);
61-
void MoveBattlerSpriteToBG(u8 battlerId, bool8 toBG_2, bool8 setSpriteInvisible);
60+
bool8 IsBattlerSpriteVisible(u8 battler);
61+
void MoveBattlerSpriteToBG(u8 battler, bool8 toBG_2, bool8 setSpriteInvisible);
6262
bool8 IsContest(void);
6363
s8 BattleAnimAdjustPanning(s8 pan);
6464
s8 BattleAnimAdjustPanning2(s8 pan);
@@ -80,7 +80,7 @@ void AnimTranslateLinearAndFlicker_Flipped(struct Sprite *sprite);
8080
void AnimWeatherBallUp(struct Sprite *sprite);
8181
void AnimWeatherBallDown(struct Sprite *sprite);
8282
void AnimSpinningSparkle(struct Sprite *sprite);
83-
void SetAverageBattlerPositions(u8 battlerId, bool8 respectMonPicOffsets, s16 *x, s16 *y);
83+
void SetAverageBattlerPositions(u8 battler, bool8 respectMonPicOffsets, s16 *x, s16 *y);
8484
void DestroySpriteAndMatrix(struct Sprite *sprite);
8585
void TranslateSpriteLinearFixedPoint(struct Sprite *sprite);
8686
void InitSpritePosToAnimAttacker(struct Sprite *sprite, bool8 respectMonPicOffsets);
@@ -89,7 +89,7 @@ void StartAnimLinearTranslation(struct Sprite *sprite);
8989
void InitAnimArcTranslation(struct Sprite *sprite);
9090
bool8 AnimTranslateLinear(struct Sprite *sprite);
9191
void TranslateAnimSpriteToTargetMonLocation(struct Sprite *sprite);
92-
u8 GetBattlerSpriteCoord2(u8 battlerId, u8 attributeId);
92+
u8 GetBattlerSpriteCoord2(u8 battler, u8 attributeId);
9393
void InitAnimLinearTranslationWithSpeed(struct Sprite *sprite);
9494
u16 ArcTan2Neg(s16 x, s16 y);
9595
void TrySetSpriteRotScale(struct Sprite *sprite, bool8 recalcCenterVector, s16 xScale, s16 yScale, u16 rotation);
@@ -98,19 +98,19 @@ void TranslateSpriteLinearAndFlicker(struct Sprite *sprite);
9898
void SetSpriteCoordsToAnimAttackerCoords(struct Sprite *sprite);
9999
void RunStoredCallbackWhenAnimEnds(struct Sprite *sprite);
100100
void SetAnimSpriteInitialXOffset(struct Sprite *sprite, s16 xOffset);
101-
s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr);
102-
u8 GetBattlerYCoordWithElevation(u8 battlerId);
101+
s16 GetBattlerSpriteCoordAttr(u8 battler, u8 attr);
102+
u8 GetBattlerYCoordWithElevation(u8 battler);
103103
void WaitAnimForDuration(struct Sprite *sprite);
104104
void AnimTravelDiagonally(struct Sprite *sprite);
105105
void InitAnimLinearTranslation(struct Sprite *sprite);
106106
void AnimTranslateLinear_WithFollowup(struct Sprite *sprite);
107-
u8 GetBattlerSpriteBGPriority(u8 battlerId);
107+
u8 GetBattlerSpriteBGPriority(u8 battler);
108108
void *LoadPointerFromVars(s16 bottom, s16 top);
109109
void StorePointerInVars(s16 *bottom, s16 *top, const void *ptr);
110110
void InitPrioritiesForVisibleBattlers(void);
111111
void GetBattleAnimBg1Data(struct BattleAnimBgData *);
112112
void GetBattleAnimBgData(struct BattleAnimBgData *, u32 bgId);
113-
u8 GetBattlerSpriteSubpriority(u8 battlerId);
113+
u8 GetBattlerSpriteSubpriority(u8 battler);
114114
bool8 TranslateAnimHorizontalArc(struct Sprite *sprite);
115115
void TranslateSpriteLinearByIdFixedPoint(struct Sprite *sprite);
116116
void ResetSpriteRotScale(u8 spriteId);
@@ -145,8 +145,8 @@ void SetGrayscaleOrOriginalPalette(u16 palNum, bool8 restoreOriginal);
145145
void PrepareAffineAnimInTaskData(struct Task *task, u8 spriteId, const union AffineAnimCmd *affineAnimCmds);
146146
bool8 RunAffineAnimFromTaskData(struct Task *task);
147147
void AnimThrowProjectile(struct Sprite *sprite);
148-
void GetBgDataForTransform(struct BattleAnimBgData *dest, u8 battlerId);
149-
u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battlerId, bool32 ignoreDeoxysForm);
148+
void GetBgDataForTransform(struct BattleAnimBgData *dest, u8 battler);
149+
u8 CreateAdditionalMonSpriteForMoveAnim(u16 species, bool8 isBackpic, u8 id, s16 x, s16 y, u8 subpriority, u32 personality, u32 trainerId, u32 battler, bool32 ignoreDeoxysForm);
150150
void ResetSpriteRotScale_PreserveAffine(struct Sprite *sprite);
151151
void Trade_MoveSelectedMonToTarget(struct Sprite *sprite);
152152
void DestroyAnimVisualTaskAndDisableBlend(u8 taskId);
@@ -178,18 +178,18 @@ enum
178178
BATTLER_COORD_ATTR_RAW_BOTTOM,
179179
};
180180

181-
u8 GetBattlerSpriteCoord(u8 battlerId, u8 attributeId);
181+
u8 GetBattlerSpriteCoord(u8 battler, u8 attributeId);
182182

183-
bool8 IsBattlerSpritePresent(u8 battlerId);
183+
bool8 IsBattlerSpritePresent(u8 battler);
184184
void ClearBattleAnimBg(u32 bgId);
185185
u8 GetAnimBattlerSpriteId(u8 wantedBattler);
186186
bool8 IsDoubleBattle(void);
187187
u8 GetBattleBgPaletteNum(void);
188-
u8 GetBattlerSpriteBGPriorityRank(u8 battlerId);
188+
u8 GetBattlerSpriteBGPriorityRank(u8 battler);
189189
void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite *));
190190
void SetSpritePrimaryCoordsFromSecondaryCoords(struct Sprite *sprite);
191-
u8 GetBattlerSpriteDefault_Y(u8 battlerId);
192-
u8 GetSubstituteSpriteDefault_Y(u8 battlerId);
191+
u8 GetBattlerSpriteDefault_Y(u8 battler);
192+
u8 GetSubstituteSpriteDefault_Y(u8 battler);
193193

194194
// battle_anim_status_effects.c
195195
#define STAT_ANIM_PLUS1 14
@@ -212,7 +212,7 @@ enum {
212212
STAT_ANIM_PAL_MULTIPLE = 0xFF
213213
};
214214

215-
void LaunchStatusAnimation(u8 battlerId, u8 statusAnimId);
215+
void LaunchStatusAnimation(u8 battler, u8 statusAnimId);
216216

217217
// battle_anim_ground.c
218218
void AnimTask_HorizontalShake(u8 taskId);

‎include/battle_gfx_sfx_util.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,36 +10,36 @@ void InitAndLaunchChosenStatusAnimation(bool8 isStatus2, u32 status);
1010
bool8 TryHandleLaunchBattleTableAnimation(u8 activeBattlerId, u8 attacker, u8 target, u8 tableId, u16 argument);
1111
void InitAndLaunchSpecialAnimation(u8 activeBattlerId, u8 attacker, u8 target, u8 tableId);
1212
bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
13-
bool8 IsBattleSEPlaying(u8 battlerId);
14-
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
15-
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battlerId);
13+
bool8 IsBattleSEPlaying(u8 battler);
14+
void BattleLoadOpponentMonSpriteGfx(struct Pokemon *mon, u8 battler);
15+
void BattleLoadPlayerMonSpriteGfx(struct Pokemon *mon, u8 battler);
1616
void BattleGfxSfxDummy2(u16 species);
17-
void DecompressTrainerFrontPic(u16 frontPicId, u8 battlerId);
18-
void DecompressTrainerBackPic(u16 backPicId, u8 battlerId);
17+
void DecompressTrainerFrontPic(u16 frontPicId, u8 battler);
18+
void DecompressTrainerBackPic(u16 backPicId, u8 battler);
1919
void BattleGfxSfxDummy3(u8 gender);
2020
void FreeTrainerFrontPicPalette(u16 frontPicId);
2121
bool8 BattleLoadAllHealthBoxesGfx(u8 state);
2222
void LoadBattleBarGfx(u8 unused);
23-
bool8 BattleInitAllSprites(u8 *state1, u8 *battlerId);
23+
bool8 BattleInitAllSprites(u8 *state1, u8 *battler);
2424
void ClearSpritesHealthboxAnimData(void);
2525
void CopyAllBattleSpritesInvisibilities(void);
26-
void CopyBattleSpriteInvisibility(u8 battlerId);
26+
void CopyBattleSpriteInvisibility(u8 battler);
2727
void HandleSpeciesGfxDataChange(u8 attacker, u8 target, bool8 notTransform);
28-
void BattleLoadSubstituteOrMonSpriteGfx(u8 battlerId, bool8 loadMonSprite);
29-
void LoadBattleMonGfxAndAnimate(u8 battlerId, bool8 loadMonSprite, u8 spriteId);
30-
void TrySetBehindSubstituteSpriteBit(u8 battlerId, u16 move);
31-
void ClearBehindSubstituteBit(u8 battlerId);
32-
void HandleLowHpMusicChange(struct Pokemon *mon, u8 battlerId);
28+
void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite);
29+
void LoadBattleMonGfxAndAnimate(u8 battler, bool8 loadMonSprite, u8 spriteId);
30+
void TrySetBehindSubstituteSpriteBit(u8 battler, u16 move);
31+
void ClearBehindSubstituteBit(u8 battler);
32+
void HandleLowHpMusicChange(struct Pokemon *mon, u8 battler);
3333
void BattleStopLowHpSound(void);
3434
u8 GetMonHPBarLevel(struct Pokemon *mon);
3535
void HandleBattleLowHpMusicChange(void);
3636
void SetBattlerSpriteAffineMode(u8 affineMode);
3737
void LoadAndCreateEnemyShadowSprites(void);
3838
void SpriteCB_SetInvisible(struct Sprite *sprite);
39-
void SetBattlerShadowSpriteCallback(u8 battlerId, u16 species);
40-
void HideBattlerShadowSprite(u8 battlerId);
39+
void SetBattlerShadowSpriteCallback(u8 battler, u16 species);
40+
void HideBattlerShadowSprite(u8 battler);
4141
void FillAroundBattleWindows(void);
42-
void ClearTemporarySpeciesSpriteData(u8 battlerId, bool8 dontClearSubstitute);
42+
void ClearTemporarySpeciesSpriteData(u8 battler, bool8 dontClearSubstitute);
4343
void AllocateMonSpritesGfx(void);
4444
void FreeMonSpritesGfx(void);
4545
bool32 ShouldPlayNormalMonCry(struct Pokemon *mon);

‎include/battle_main.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,12 @@ void SwitchInClearSetData(void);
6969
void FaintClearSetData(void);
7070
void BattleTurnPassed(void);
7171
u8 IsRunningFromBattleImpossible(void);
72-
void SwitchPartyOrder(u8 battlerId);
72+
void SwitchPartyOrder(u8 battler);
7373
void SwapTurnOrder(u8 id1, u8 id2);
7474
u8 GetWhoStrikesFirst(u8 battlerId1, u8 battlerId2, bool8 ignoreChosenMoves);
7575
void RunBattleScriptCommands_PopCallbacksStack(void);
7676
void RunBattleScriptCommands(void);
77-
bool8 TryRunFromBattle(u8 battlerId);
77+
bool8 TryRunFromBattle(u8 battler);
7878
void SpecialStatusesClear(void);
7979

8080
extern struct MultiPartnerMenuPokemon gMultiPartnerParty[MULTI_PARTY_SIZE];

‎include/battle_records.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
extern u8 gRecordsWindowId;
55

66
void ClearPlayerLinkBattleRecords(void);
7-
void UpdatePlayerLinkBattleRecords(s32 battlerId);
7+
void UpdatePlayerLinkBattleRecords(s32 battler);
88
void ShowLinkBattleRecords(void);
99
void RemoveRecordsWindow(void);
1010
void ShowTrainerHillRecords(void);

‎include/battle_script_commands.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,13 @@
1313
void AI_CalcDmg(u8 battlerIdAtk, u8 battlerIdDef);
1414
u8 TypeCalc(u16 move, u8 battlerIdAtk, u8 battlerIdDef);
1515
u8 AI_TypeCalc(u16 move, u16 targetSpecies, u8 targetAbility);
16-
u8 GetBattlerTurnOrderNum(u8 battlerId);
16+
u8 GetBattlerTurnOrderNum(u8 battler);
1717
void SetMoveEffect(bool8 primary, u8 certain);
1818
void BattleDestroyYesNoCursorAt(u8 cursorPosition);
1919
void BattleCreateYesNoCursorAt(u8 cursorPosition);
2020
void BufferMoveToLearnIntoBattleTextBuff2(void);
2121
void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
22-
bool8 UproarWakeUpCheck(u8 battlerId);
22+
bool8 UproarWakeUpCheck(u8 battler);
2323

2424
extern void (* const gBattleScriptingCommandsTable[])(void);
2525
extern const u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4];

‎include/battle_tv.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ void BattleTv_SetDataBasedOnMove(u16 move, u16 weatherFlags, struct DisableStruc
66
void BattleTv_SetDataBasedOnAnimation(u8 animationId);
77
void TryPutLinkBattleTvShowOnAir(void);
88
void BattleTv_ClearExplosionFaintCause(void);
9-
u8 GetBattlerMoveSlotId(u8 battlerId, u16 moveId);
9+
u8 GetBattlerMoveSlotId(u8 battler, u16 moveId);
1010

1111
#endif // GUARD_BATTLE_TV_H

‎include/battle_util.h‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define ABILITYEFFECT_WATER_SPORT 254
3434
#define ABILITYEFFECT_SWITCH_IN_WEATHER 255
3535

36-
#define ABILITY_ON_OPPOSING_FIELD(battlerId, abilityId) (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battlerId, abilityId, 0, 0))
36+
#define ABILITY_ON_OPPOSING_FIELD(battler, abilityId) (AbilityBattleEffects(ABILITYEFFECT_CHECK_OTHER_SIDE, battler, abilityId, 0, 0))
3737
#define ABILITY_ON_FIELD(abilityId) (AbilityBattleEffects(ABILITYEFFECT_CHECK_ON_FIELD, 0, abilityId, 0, 0))
3838
#define ABILITY_ON_FIELD2(abilityId) (AbilityBattleEffects(ABILITYEFFECT_FIELD_SPORT, 0, abilityId, 0, 0))
3939

@@ -64,34 +64,34 @@ u8 GetBattlerForBattleScript(u8 caseId);
6464
void PressurePPLose(u8 target, u8 attacker, u16 move);
6565
void PressurePPLoseOnUsingPerishSong(u8 attacker);
6666
void PressurePPLoseOnUsingImprison(u8 attacker);
67-
void MarkBattlerForControllerExec(u8 battlerId);
68-
void MarkBattlerReceivedLinkData(u8 battlerId);
69-
void CancelMultiTurnMoves(u8 battlerId);
70-
bool8 WasUnableToUseMove(u8 battlerId);
71-
void PrepareStringBattle(u16 stringId, u8 battlerId);
67+
void MarkBattlerForControllerExec(u8 battler);
68+
void MarkBattlerReceivedLinkData(u8 battler);
69+
void CancelMultiTurnMoves(u8 battler);
70+
bool8 WasUnableToUseMove(u8 battler);
71+
void PrepareStringBattle(u16 stringId, u8 battler);
7272
void ResetSentPokesToOpponentValue(void);
73-
void OpponentSwitchInResetSentPokesToOpponentValue(u8 battlerId);
74-
void UpdateSentPokesToOpponentValue(u8 battlerId);
73+
void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler);
74+
void UpdateSentPokesToOpponentValue(u8 battler);
7575
void BattleScriptPush(const u8 *bsPtr);
7676
void BattleScriptPushCursor(void);
7777
void BattleScriptPop(void);
7878
u8 TrySetCantSelectMoveBattleScript(void);
79-
u8 CheckMoveLimitations(u8 battlerId, u8 unusableMoves, u8 check);
79+
u8 CheckMoveLimitations(u8 battler, u8 unusableMoves, u8 check);
8080
bool8 AreAllMovesUnusable(void);
81-
u8 GetImprisonedMovesCount(u8 battlerId, u16 move);
81+
u8 GetImprisonedMovesCount(u8 battler, u16 move);
8282
u8 DoFieldEndTurnEffects(void);
8383
u8 DoBattlerEndTurnEffects(void);
8484
bool8 HandleWishPerishSongOnTurnEnd(void);
8585
bool8 HandleFaintedMonActions(void);
8686
void TryClearRageStatuses(void);
8787
u8 AtkCanceller_UnableToUseMove(void);
88-
bool8 HasNoMonsToSwitch(u8 battlerId, u8 r1, u8 r2);
89-
u8 CastformDataTypeChange(u8 battlerId);
90-
u8 AbilityBattleEffects(u8 caseID, u8 battlerId, u8 ability, u8 special, u16 moveArg);
88+
bool8 HasNoMonsToSwitch(u8 battler, u8 r1, u8 r2);
89+
u8 CastformDataTypeChange(u8 battler);
90+
u8 AbilityBattleEffects(u8 caseID, u8 battler, u8 ability, u8 special, u16 moveArg);
9191
void BattleScriptExecute(const u8 *BS_ptr);
9292
void BattleScriptPushCursorAndCallback(const u8 *BS_ptr);
93-
u8 ItemBattleEffects(u8 caseID, u8 battlerId, bool8 moveTurn);
94-
void ClearFuryCutterDestinyBondGrudge(u8 battlerId);
93+
u8 ItemBattleEffects(u8 caseID, u8 battler, bool8 moveTurn);
94+
void ClearFuryCutterDestinyBondGrudge(u8 battler);
9595
void HandleAction_RunBattleScript(void);
9696
u8 GetMoveTarget(u16 move, u8 setTarget);
9797
u8 IsMonDisobedient(void);

‎include/party_menu.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ void ChooseMonForWirelessMinigame(void);
7171
void OpenPartyMenuInBattle(u8 partyAction);
7272
void ChooseMonForInBattleItem(void);
7373
void BufferBattlePartyCurrentOrder(void);
74-
void BufferBattlePartyCurrentOrderBySide(u8 battlerId, u8 flankId);
75-
void SwitchPartyOrderLinkMulti(u8 battlerId, u8 slot, u8 arrayIndex);
74+
void BufferBattlePartyCurrentOrderBySide(u8 battler, u8 flankId);
75+
void SwitchPartyOrderLinkMulti(u8 battler, u8 slot, u8 arrayIndex);
7676
void SwitchPartyMonSlots(u8 slot, u8 slot2);
7777
u8 GetPartyIdFromBattlePartyId(u8 slot);
7878
void ShowPartyMenuToShowcaseMultiBattleParty(void);

0 commit comments

Comments
 (0)