Skip to content

Commit 1f23fe0

Browse files
AsparagusEduardoAsparagusEduardo
authored
Use GetPartyBattlerData where appropiate (#6779)
1 parent 76b9a69 commit 1f23fe0

27 files changed

+225
-231
lines changed

‎src/battle_ai_switch_items.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2379,11 +2379,11 @@ static bool32 ShouldUseItem(u32 battler)
23792379
switch (ItemId_GetBattleUsage(item))
23802380
{
23812381
case EFFECT_ITEM_HEAL_AND_CURE_STATUS:
2382-
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], &gEnemyParty[gBattlerPartyIndexes[battler]]);
2382+
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetPartyBattlerData(battler));
23832383
shouldUse = AI_ShouldHeal(battler, healAmount);
23842384
break;
23852385
case EFFECT_ITEM_RESTORE_HP:
2386-
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], &gEnemyParty[gBattlerPartyIndexes[battler]]);
2386+
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetPartyBattlerData(battler));
23872387
shouldUse = AI_ShouldHeal(battler, healAmount);
23882388
break;
23892389
case EFFECT_ITEM_CURE_STATUS:

‎src/battle_anim.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2236,7 +2236,7 @@ static void Cmd_createdragondartsprite(void)
22362236
u8 argVar;
22372237
u8 argsCount;
22382238
s16 subpriority;
2239-
struct Pokemon *party = GetBattlerParty(gBattleAnimAttacker);
2239+
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimAttacker);
22402240

22412241
sBattleAnimScriptPtr++;
22422242

@@ -2253,10 +2253,10 @@ static void Cmd_createdragondartsprite(void)
22532253

22542254
subpriority = GetSubpriorityForMoveAnim(argVar);
22552255

2256-
if (GetMonData(&party[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES) == SPECIES_DRAGAPULT)
2256+
if (GetMonData(mon, MON_DATA_SPECIES) == SPECIES_DRAGAPULT)
22572257
{
22582258
template.tileTag = ANIM_TAG_DREEPY;
2259-
if (IsMonShiny(&party[gBattlerPartyIndexes[gBattleAnimAttacker]]) == TRUE)
2259+
if (IsMonShiny(mon) == TRUE)
22602260
template.paletteTag = ANIM_TAG_DREEPY_SHINY;
22612261
else
22622262
template.paletteTag = ANIM_TAG_DREEPY;

‎src/battle_anim_new.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9281,8 +9281,8 @@ void AnimTask_GetWeatherToSet(u8 taskId)
92819281

92829282
void AnimTask_SyrupBomb(u8 taskId)
92839283
{
9284-
struct Pokemon *party = GetBattlerParty(gBattleAnimAttacker);
9285-
gBattleAnimArgs[0] = IsMonShiny(&party[gBattlerPartyIndexes[gBattleAnimAttacker]]);
9284+
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimAttacker);
9285+
gBattleAnimArgs[0] = IsMonShiny(mon);
92869286
DestroyAnimVisualTask(taskId);
92879287
}
92889288

‎src/battle_controller_link_opponent.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
198198
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
199199
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
200200
{
201-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
201+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
202202
}
203203
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
204204
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive
205205
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
206206
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim)
207207
{
208-
TryShinyAnimation(BATTLE_PARTNER(battler), &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(battler)]]);
208+
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler)));
209209
}
210210

211211
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
@@ -214,11 +214,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
214214
{
215215
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
216216
{
217-
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(battler)]], HEALTHBOX_ALL);
217+
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
218218
StartHealthboxSlideIn(BATTLE_PARTNER(battler));
219219
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
220220
}
221-
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gEnemyParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
221+
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL);
222222
StartHealthboxSlideIn(battler);
223223
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
224224
}
@@ -262,12 +262,12 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
262262
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
263263
{
264264
DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]);
265-
SetBattlerShadowSpriteCallback(BATTLE_PARTNER(battler), GetMonData(&gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(battler)]], MON_DATA_SPECIES));
265+
SetBattlerShadowSpriteCallback(BATTLE_PARTNER(battler), GetMonData(GetPartyBattlerData(BATTLE_PARTNER(battler)), MON_DATA_SPECIES));
266266
}
267267

268268

269269
DestroySprite(&gSprites[gBattleControllerData[battler]]);
270-
SetBattlerShadowSpriteCallback(battler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES));
270+
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES));
271271

272272
gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
273273
gBattleSpritesDataPtr->healthBoxesData[battler].bgmRestored = FALSE;
@@ -285,7 +285,7 @@ static void TryShinyAnimAfterMonAnim(u32 battler)
285285
{
286286
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
287287
{
288-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
288+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
289289
}
290290
else if (gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
291291
{
@@ -335,7 +335,7 @@ static void SwitchIn_ShowHealthbox(u32 battler)
335335

336336
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
337337

338-
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gEnemyParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
338+
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL);
339339
StartHealthboxSlideIn(battler);
340340
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
341341
CopyBattleSpriteInvisibility(battler);
@@ -348,14 +348,14 @@ static void SwitchIn_TryShinyAnim(u32 battler)
348348
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
349349
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
350350
{
351-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
351+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
352352
}
353353

354354
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
355355
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
356356
{
357357
DestroySprite(&gSprites[gBattleControllerData[battler]]);
358-
SetBattlerShadowSpriteCallback(battler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES));
358+
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES));
359359
gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox;
360360
}
361361
}

‎src/battle_controller_link_partner.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,9 @@ static void SwitchIn_ShowHealthbox(u32 battler)
160160
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
161161

162162
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);
163-
HandleLowHpMusicChange(&gPlayerParty[gBattlerPartyIndexes[battler]], battler);
163+
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler);
164164
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
165-
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gPlayerParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
165+
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL);
166166
StartHealthboxSlideIn(battler);
167167
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
168168

@@ -175,7 +175,7 @@ static void SwitchIn_TryShinyAnim(u32 battler)
175175
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
176176
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
177177
{
178-
TryShinyAnimation(battler, &gPlayerParty[gBattlerPartyIndexes[battler]]);
178+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
179179
}
180180

181181
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy

‎src/battle_controller_opponent.c‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ static void TrySetBattlerShadowSpriteCallback(u32 battler)
220220
|| P_GBA_STYLE_SPECIES_GFX == TRUE
221221
|| gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback == SpriteCallbackDummy)
222222
{
223-
SetBattlerShadowSpriteCallback(battler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES));
223+
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES));
224224
}
225225
}
226226
}
@@ -234,7 +234,7 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
234234
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
235235
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
236236
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
237-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
237+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
238238

239239
twoMons = TwoOpponentIntroMons(battler);
240240
if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
@@ -243,19 +243,19 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
243243
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
244244
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive
245245
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim)
246-
TryShinyAnimation(BATTLE_PARTNER(battler), &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(battler)]]);
246+
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler)));
247247

248248
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
249249
{
250250
if (!gBattleSpritesDataPtr->healthBoxesData[battler].healthboxSlideInStarted)
251251
{
252252
if (twoMons && (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) || BATTLE_TWO_VS_ONE_OPPONENT))
253253
{
254-
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], &gEnemyParty[gBattlerPartyIndexes[BATTLE_PARTNER(battler)]], HEALTHBOX_ALL);
254+
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
255255
StartHealthboxSlideIn(BATTLE_PARTNER(battler));
256256
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
257257
}
258-
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gEnemyParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
258+
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL);
259259
StartHealthboxSlideIn(battler);
260260
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
261261
}
@@ -328,7 +328,7 @@ static void TryShinyAnimAfterMonAnim(u32 battler)
328328
if (gSprites[gBattlerSpriteIds[battler]].x2 == 0
329329
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
330330
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
331-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
331+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
332332

333333
if (gSprites[gBattlerSpriteIds[battler]].callback == SpriteCallbackDummy
334334
&& gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
@@ -374,7 +374,7 @@ static void SwitchIn_ShowHealthbox(u32 battler)
374374
FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
375375
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
376376
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
377-
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], &gEnemyParty[gBattlerPartyIndexes[battler]], HEALTHBOX_ALL);
377+
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL);
378378
StartHealthboxSlideIn(battler);
379379
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
380380
CopyBattleSpriteInvisibility(battler);
@@ -386,13 +386,13 @@ static void SwitchIn_TryShinyAnim(u32 battler)
386386
{
387387
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
388388
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
389-
TryShinyAnimation(battler, &gEnemyParty[gBattlerPartyIndexes[battler]]);
389+
TryShinyAnimation(battler, GetPartyBattlerData(battler));
390390

391391
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
392392
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
393393
{
394394
DestroySprite(&gSprites[gBattleControllerData[battler]]);
395-
SetBattlerShadowSpriteCallback(battler, GetMonData(&gEnemyParty[gBattlerPartyIndexes[battler]], MON_DATA_SPECIES));
395+
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES));
396396
gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox;
397397
}
398398
}

0 commit comments

Comments
 (0)