Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename GetPartyBattlerData to GetBattlerMon (#6800)

Browse Source
This commit is contained in:
Eduardo Quezada 2025-05-09 09:14:09 -04:00 committed by GitHub
parent 04cebed982
commit 392d662c12
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
37 changed files with 244 additions and 244 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle.h
View File

@ -1204,7 +1204,7 @@ static inline u32 GetOpposingSideBattler(u32 battler)
return GetBattlerAtPosition(BATTLE_OPPOSITE(GetBattlerSide(battler))); return GetBattlerAtPosition(BATTLE_OPPOSITE(GetBattlerSide(battler)));
} }
static inline struct Pokemon* GetPartyBattlerData(u32 battler) static inline struct Pokemon* GetBattlerMon(u32 battler)
{ {
u32 index = gBattlerPartyIndexes[battler]; u32 index = gBattlerPartyIndexes[battler];
return (GetBattlerSide(battler) == B_SIDE_OPPONENT) ? &gEnemyParty[index] : &gPlayerParty[index]; return (GetBattlerSide(battler) == B_SIDE_OPPONENT) ? &gEnemyParty[index] : &gPlayerParty[index];

4
src/battle_ai_switch_items.c
View File

@ -2384,11 +2384,11 @@ static bool32 ShouldUseItem(u32 battler)
switch (ItemId_GetBattleUsage(item)) switch (ItemId_GetBattleUsage(item))
{ {
case EFFECT_ITEM_HEAL_AND_CURE_STATUS: case EFFECT_ITEM_HEAL_AND_CURE_STATUS:
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetPartyBattlerData(battler)); healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetBattlerMon(battler));
shouldUse = AI_ShouldHeal(battler, healAmount); shouldUse = AI_ShouldHeal(battler, healAmount);
break; break;
case EFFECT_ITEM_RESTORE_HP: case EFFECT_ITEM_RESTORE_HP:
healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetPartyBattlerData(battler)); healAmount = GetHPHealAmount(itemEffects[GetItemEffectParamOffset(battler, item, 4, ITEM4_HEAL_HP)], GetBattlerMon(battler));
shouldUse = AI_ShouldHeal(battler, healAmount); shouldUse = AI_ShouldHeal(battler, healAmount);
break; break;
case EFFECT_ITEM_CURE_STATUS: case EFFECT_ITEM_CURE_STATUS:

4
src/battle_anim.c
View File

@ -370,7 +370,7 @@ void LaunchBattleAnimation(u32 animType, u32 animId)
InitPrioritiesForVisibleBattlers(); InitPrioritiesForVisibleBattlers();
UpdateOamPriorityInAllHealthboxes(0, sAnimHideHpBoxes); UpdateOamPriorityInAllHealthboxes(0, sAnimHideHpBoxes);
for (i = 0; i < MAX_BATTLERS_COUNT; i++) for (i = 0; i < MAX_BATTLERS_COUNT; i++)
gAnimBattlerSpecies[i] = GetMonData(GetPartyBattlerData(i), MON_DATA_SPECIES); gAnimBattlerSpecies[i] = GetMonData(GetBattlerMon(i), MON_DATA_SPECIES);
} }
else else
{ {
@ -2236,7 +2236,7 @@ static void Cmd_createdragondartsprite(void)
u8 argVar; u8 argVar;
u8 argsCount; u8 argsCount;
s16 subpriority; s16 subpriority;
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimAttacker); struct Pokemon *mon = GetBattlerMon(gBattleAnimAttacker);
sBattleAnimScriptPtr++; sBattleAnimScriptPtr++;

2
src/battle_anim_dark.c
View File

@ -934,7 +934,7 @@ void AnimTask_MetallicShine(u8 taskId)
if (IsContest()) if (IsContest())
species = gContestResources->moveAnim->species; species = gContestResources->moveAnim->species;
else else
species = GetMonData(GetPartyBattlerData(gBattleAnimAttacker), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(gBattleAnimAttacker), MON_DATA_SPECIES);
spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
newSpriteId = CreateInvisibleSpriteCopy(gBattleAnimAttacker, spriteId, species); newSpriteId = CreateInvisibleSpriteCopy(gBattleAnimAttacker, spriteId, species);

4
src/battle_anim_effects_3.c
View File

@ -3420,7 +3420,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
} }
else else
{ {
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimTarget); struct Pokemon *mon = GetBattlerMon(gBattleAnimTarget);
if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER) if (GetBattlerSide(gBattleAnimAttacker) != B_SIDE_PLAYER)
isBackPic = FALSE; isBackPic = FALSE;
else else
@ -5304,7 +5304,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
} }
else else
{ {
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimAttacker); struct Pokemon *mon = GetBattlerMon(gBattleAnimAttacker);
personality = GetMonData(mon, MON_DATA_PERSONALITY); personality = GetMonData(mon, MON_DATA_PERSONALITY);
isShiny = GetMonData(mon, MON_DATA_IS_SHINY); isShiny = GetMonData(mon, MON_DATA_IS_SHINY);
if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE)

12
src/battle_anim_mons.c
View File

@ -118,7 +118,7 @@ u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType)
} }
else else
{ {
mon = GetPartyBattlerData(battlerId); mon = GetBattlerMon(battlerId);
illusionMon = GetIllusionMonPtr(battlerId); illusionMon = GetIllusionMonPtr(battlerId);
if (illusionMon != NULL) if (illusionMon != NULL)
mon = illusionMon; mon = illusionMon;
@ -162,7 +162,7 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
{ {
spriteInfo = gBattleSpritesDataPtr->battlerData; spriteInfo = gBattleSpritesDataPtr->battlerData;
if (!spriteInfo[battlerId].transformSpecies) if (!spriteInfo[battlerId].transformSpecies)
personality = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_PERSONALITY); personality = GetMonData(GetBattlerMon(battlerId), MON_DATA_PERSONALITY);
else else
personality = gTransformedPersonalities[battlerId]; personality = gTransformedPersonalities[battlerId];
species = GetUnownSpeciesId(personality); species = GetUnownSpeciesId(personality);
@ -275,7 +275,7 @@ u8 GetBattlerYCoordWithElevation(u8 battlerId)
spriteInfo = gBattleSpritesDataPtr->battlerData; spriteInfo = gBattleSpritesDataPtr->battlerData;
if (!spriteInfo[battlerId].transformSpecies) if (!spriteInfo[battlerId].transformSpecies)
species = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(battlerId), MON_DATA_SPECIES);
else else
species = spriteInfo[battlerId].transformSpecies; species = spriteInfo[battlerId].transformSpecies;
@ -817,7 +817,7 @@ bool8 IsBattlerSpritePresent(u8 battlerId)
if (GetBattlerPosition(battlerId) == 0xff) if (GetBattlerPosition(battlerId) == 0xff)
return FALSE; return FALSE;
if (!gBattleStruct->spriteIgnore0Hp && GetMonData(GetPartyBattlerData(battlerId), MON_DATA_HP) == 0) if (!gBattleStruct->spriteIgnore0Hp && GetMonData(GetBattlerMon(battlerId), MON_DATA_HP) == 0)
return FALSE; return FALSE;
return TRUE; return TRUE;
} }
@ -1851,7 +1851,7 @@ static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId)
{ {
spriteInfo = gBattleSpritesDataPtr->battlerData; spriteInfo = gBattleSpritesDataPtr->battlerData;
if (!spriteInfo[battlerId].transformSpecies) if (!spriteInfo[battlerId].transformSpecies)
species = GetMonData(GetPartyBattlerData(i), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(i), MON_DATA_SPECIES);
else else
species = spriteInfo[battlerId].transformSpecies; species = spriteInfo[battlerId].transformSpecies;
@ -2082,7 +2082,7 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr)
} }
else else
{ {
struct Pokemon *mon = GetPartyBattlerData(battlerId); struct Pokemon *mon = GetBattlerMon(battlerId);
spriteInfo = gBattleSpritesDataPtr->battlerData; spriteInfo = gBattleSpritesDataPtr->battlerData;
if (!spriteInfo[battlerId].transformSpecies) if (!spriteInfo[battlerId].transformSpecies)

2
src/battle_anim_new.c
View File

@ -9281,7 +9281,7 @@ void AnimTask_GetWeatherToSet(u8 taskId)
void AnimTask_SyrupBomb(u8 taskId) void AnimTask_SyrupBomb(u8 taskId)
{ {
struct Pokemon *mon = GetPartyBattlerData(gBattleAnimAttacker); struct Pokemon *mon = GetBattlerMon(gBattleAnimAttacker);
gBattleAnimArgs[0] = IsMonShiny(mon); gBattleAnimArgs[0] = IsMonShiny(mon);
DestroyAnimVisualTask(taskId); DestroyAnimVisualTask(taskId);
} }

2
src/battle_anim_throw.c
View File

@ -908,7 +908,7 @@ void AnimTask_SwitchOutBallEffect(u8 taskId)
u32 selectedPalettes; u32 selectedPalettes;
spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; spriteId = gBattlerSpriteIds[gBattleAnimAttacker];
ballId = GetMonData(GetPartyBattlerData(gBattleAnimAttacker), MON_DATA_POKEBALL); ballId = GetMonData(GetBattlerMon(gBattleAnimAttacker), MON_DATA_POKEBALL);
switch (gTasks[taskId].data[0]) switch (gTasks[taskId].data[0])
{ {

6
src/battle_anim_utility_funcs.c
View File

@ -318,7 +318,7 @@ void AnimTask_DrawFallingWhiteLinesOnAttacker(u8 taskId)
if (IsContest()) if (IsContest())
species = gContestResources->moveAnim->species; species = gContestResources->moveAnim->species;
else else
species = GetMonData(GetPartyBattlerData(gBattleAnimAttacker), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(gBattleAnimAttacker), MON_DATA_SPECIES);
spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER); spriteId = GetAnimBattlerSpriteId(ANIM_ATTACKER);
newSpriteId = CreateInvisibleSpriteCopy(gBattleAnimAttacker, spriteId, species); newSpriteId = CreateInvisibleSpriteCopy(gBattleAnimAttacker, spriteId, species);
@ -453,7 +453,7 @@ static void StatsChangeAnimation_Step1(u8 taskId)
if (IsContest()) if (IsContest())
sAnimStatsChangeData->species = gContestResources->moveAnim->species; sAnimStatsChangeData->species = gContestResources->moveAnim->species;
else else
sAnimStatsChangeData->species = GetMonData(GetPartyBattlerData(sAnimStatsChangeData->battler1), MON_DATA_SPECIES); sAnimStatsChangeData->species = GetMonData(GetBattlerMon(sAnimStatsChangeData->battler1), MON_DATA_SPECIES);
gTasks[taskId].func = StatsChangeAnimation_Step2; gTasks[taskId].func = StatsChangeAnimation_Step2;
} }
@ -832,7 +832,7 @@ void StartMonScrollingBgMask(u8 taskId, int UNUSED unused, u16 scrollSpeed, u8 b
if (IsContest()) if (IsContest())
species = gContestResources->moveAnim->species; species = gContestResources->moveAnim->species;
else else
species = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES);
spriteId = CreateInvisibleSpriteCopy(battler, gBattlerSpriteIds[battler], species); spriteId = CreateInvisibleSpriteCopy(battler, gBattlerSpriteIds[battler], species);
if (includePartner) if (includePartner)

2
src/battle_anim_water.c
View File

@ -1360,7 +1360,7 @@ static u8 GetWaterSpoutPowerForAnim(void)
u8 i; u8 i;
u16 hp; u16 hp;
u16 maxhp; u16 maxhp;
struct Pokemon *slot = GetPartyBattlerData(gBattleAnimAttacker); struct Pokemon *slot = GetBattlerMon(gBattleAnimAttacker);
maxhp = GetMonData(slot, MON_DATA_MAX_HP); maxhp = GetMonData(slot, MON_DATA_MAX_HP);
hp = GetMonData(slot, MON_DATA_HP); hp = GetMonData(slot, MON_DATA_HP);

20
src/battle_controller_link_opponent.c
View File

@ -198,14 +198,14 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) if (!(gBattleTypeFlags & BATTLE_TYPE_MULTI)
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim)
{ {
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
} }
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
@ -214,11 +214,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
} }
@ -262,12 +262,12 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]); DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]);
SetBattlerShadowSpriteCallback(BATTLE_PARTNER(battler), GetMonData(GetPartyBattlerData(BATTLE_PARTNER(battler)), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(BATTLE_PARTNER(battler), GetMonData(GetBattlerMon(BATTLE_PARTNER(battler)), MON_DATA_SPECIES));
} }
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
gBattleSpritesDataPtr->animationData->introAnimActive = FALSE; gBattleSpritesDataPtr->animationData->introAnimActive = FALSE;
gBattleSpritesDataPtr->healthBoxesData[battler].bgmRestored = FALSE; gBattleSpritesDataPtr->healthBoxesData[battler].bgmRestored = FALSE;
@ -285,7 +285,7 @@ static void TryShinyAnimAfterMonAnim(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim) if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
else if (gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim) else if (gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
{ {
@ -335,7 +335,7 @@ static void SwitchIn_ShowHealthbox(u32 battler)
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
CopyBattleSpriteInvisibility(battler); CopyBattleSpriteInvisibility(battler);
@ -348,14 +348,14 @@ static void SwitchIn_TryShinyAnim(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox; gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox;
} }
} }

6
src/battle_controller_link_partner.c
View File

@ -160,9 +160,9 @@ static void SwitchIn_ShowHealthbox(u32 battler)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10); CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
@ -175,7 +175,7 @@ static void SwitchIn_TryShinyAnim(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy

18
src/battle_controller_opponent.c
View File

@ -220,7 +220,7 @@ static void TrySetBattlerShadowSpriteCallback(u32 battler)
|| P_GBA_STYLE_SPECIES_GFX == TRUE || P_GBA_STYLE_SPECIES_GFX == TRUE
|| gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback == SpriteCallbackDummy) || gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback == SpriteCallbackDummy)
{ {
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
} }
} }
} }
@ -234,7 +234,7 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
twoMons = TwoOpponentIntroMons(battler); twoMons = TwoOpponentIntroMons(battler);
if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS) if (!(gBattleTypeFlags & BATTLE_TYPE_TWO_OPPONENTS)
@ -243,7 +243,7 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].finishedShinyMonAnim)
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
{ {
@ -251,11 +251,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (twoMons && (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) || BATTLE_TWO_VS_ONE_OPPONENT)) if (twoMons && (!(gBattleTypeFlags & BATTLE_TYPE_MULTI) || BATTLE_TWO_VS_ONE_OPPONENT))
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
} }
@ -328,7 +328,7 @@ static void TryShinyAnimAfterMonAnim(u32 battler)
if (gSprites[gBattlerSpriteIds[battler]].x2 == 0 if (gSprites[gBattlerSpriteIds[battler]].x2 == 0
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim && !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (gSprites[gBattlerSpriteIds[battler]].callback == SpriteCallbackDummy if (gSprites[gBattlerSpriteIds[battler]].callback == SpriteCallbackDummy
&& gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim) && gBattleSpritesDataPtr->healthBoxesData[battler].finishedShinyMonAnim)
@ -374,7 +374,7 @@ static void SwitchIn_ShowHealthbox(u32 battler)
FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS); FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
CopyBattleSpriteInvisibility(battler); CopyBattleSpriteInvisibility(battler);
@ -386,13 +386,13 @@ static void SwitchIn_TryShinyAnim(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox; gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox;
} }
} }

42
src/battle_controller_player.c
View File

@ -429,7 +429,7 @@ void HandleInputChooseTarget(u32 battler)
{ {
s32 i; s32 i;
static const u8 identities[MAX_BATTLERS_COUNT] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT}; static const u8 identities[MAX_BATTLERS_COUNT] = {B_POSITION_PLAYER_LEFT, B_POSITION_PLAYER_RIGHT, B_POSITION_OPPONENT_RIGHT, B_POSITION_OPPONENT_LEFT};
u16 move = GetMonData(GetPartyBattlerData(battler), MON_DATA_MOVE1 + gMoveSelectionCursor[battler]); u16 move = GetMonData(GetBattlerMon(battler), MON_DATA_MOVE1 + gMoveSelectionCursor[battler]);
u16 moveTarget = GetBattlerMoveTargetType(battler, move); u16 moveTarget = GetBattlerMoveTargetType(battler, move);
DoBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX, 15, 1); DoBounceEffect(gMultiUsePlayerCursor, BOUNCE_HEALTHBOX, 15, 1);
@ -1037,11 +1037,11 @@ void HandleMoveSwitching(u32 battler)
{ {
for (i = 0; i < MAX_MON_MOVES; i++) for (i = 0; i < MAX_MON_MOVES; i++)
{ {
moveStruct.moves[i] = GetMonData(GetPartyBattlerData(battler), MON_DATA_MOVE1 + i); moveStruct.moves[i] = GetMonData(GetBattlerMon(battler), MON_DATA_MOVE1 + i);
moveStruct.currentPp[i] = GetMonData(GetPartyBattlerData(battler), MON_DATA_PP1 + i); moveStruct.currentPp[i] = GetMonData(GetBattlerMon(battler), MON_DATA_PP1 + i);
} }
totalPPBonuses = GetMonData(GetPartyBattlerData(battler), MON_DATA_PP_BONUSES); totalPPBonuses = GetMonData(GetBattlerMon(battler), MON_DATA_PP_BONUSES);
for (i = 0; i < MAX_MON_MOVES; i++) for (i = 0; i < MAX_MON_MOVES; i++)
perMovePPBonuses[i] = (totalPPBonuses & (3 << (i * 2))) >> (i * 2); perMovePPBonuses[i] = (totalPPBonuses & (3 << (i * 2))) >> (i * 2);
@ -1063,11 +1063,11 @@ void HandleMoveSwitching(u32 battler)
for (i = 0; i < MAX_MON_MOVES; i++) for (i = 0; i < MAX_MON_MOVES; i++)
{ {
SetMonData(GetPartyBattlerData(battler), MON_DATA_MOVE1 + i, &moveStruct.moves[i]); SetMonData(GetBattlerMon(battler), MON_DATA_MOVE1 + i, &moveStruct.moves[i]);
SetMonData(GetPartyBattlerData(battler), MON_DATA_PP1 + i, &moveStruct.currentPp[i]); SetMonData(GetBattlerMon(battler), MON_DATA_PP1 + i, &moveStruct.currentPp[i]);
} }
SetMonData(GetPartyBattlerData(battler), MON_DATA_PP_BONUSES, &totalPPBonuses); SetMonData(GetBattlerMon(battler), MON_DATA_PP_BONUSES, &totalPPBonuses);
} }
} }
@ -1264,10 +1264,10 @@ static void Intro_WaitForShinyAnimAndHealthbox(u32 battler)
FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS); FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
if (TwoPlayerIntroMons(battler)) if (TwoPlayerIntroMons(battler))
HandleLowHpMusicChange(GetPartyBattlerData(BATTLE_PARTNER(battler)), BATTLE_PARTNER(battler)); HandleLowHpMusicChange(GetBattlerMon(BATTLE_PARTNER(battler)), BATTLE_PARTNER(battler));
gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 3; gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 3;
gBattlerControllerFuncs[battler] = Intro_DelayAndEnd; gBattlerControllerFuncs[battler] = Intro_DelayAndEnd;
@ -1282,12 +1282,12 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
// Start shiny animation if applicable for 1st Pokémon // Start shiny animation if applicable for 1st Pokémon
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
// Start shiny animation if applicable for 2nd Pokémon // Start shiny animation if applicable for 2nd Pokémon
if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
// Show healthbox after ball anim // Show healthbox after ball anim
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
@ -1297,11 +1297,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (TwoPlayerIntroMons(battler) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (TwoPlayerIntroMons(battler) && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
} }
@ -1388,7 +1388,7 @@ static void SwitchIn_HandleSoundAndEnd(u32 battler)
&& !IsCryPlayingOrClearCrySongs()) && !IsCryPlayingOrClearCrySongs())
{ {
m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100); m4aMPlayVolumeControl(&gMPlayInfo_BGM, TRACKS_ALL, 0x100);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
PlayerBufferExecCompleted(battler); PlayerBufferExecCompleted(battler);
} }
} }
@ -1398,14 +1398,14 @@ static void SwitchIn_TryShinyAnimShowHealthbox(u32 battler)
// Start shiny animation if applicable // Start shiny animation if applicable
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
// Wait for ball anim, then show healthbox // Wait for ball anim, then show healthbox
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
gBattlerControllerFuncs[battler] = SwitchIn_CleanShinyAnimShowSubstitute; gBattlerControllerFuncs[battler] = SwitchIn_CleanShinyAnimShowSubstitute;
@ -1768,7 +1768,7 @@ static void MoveSelectionDisplayMoveType(u32 battler)
} }
else if (P_SHOW_DYNAMIC_TYPES) // Non-vanilla changes to battle UI showing dynamic types else if (P_SHOW_DYNAMIC_TYPES) // Non-vanilla changes to battle UI showing dynamic types
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
type = CheckDynamicMoveType(mon, move, battler); type = CheckDynamicMoveType(mon, move, battler);
} }
end = StringCopy(txtPtr, gTypesInfo[type].name); end = StringCopy(txtPtr, gTypesInfo[type].name);
@ -1892,7 +1892,7 @@ static void PrintLinkStandbyMsg(void)
static void PlayerHandleLoadMonSprite(u32 battler) static void PlayerHandleLoadMonSprite(u32 battler)
{ {
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
gBattlerControllerFuncs[battler] = CompleteOnBattlerSpritePosX_0; gBattlerControllerFuncs[battler] = CompleteOnBattlerSpritePosX_0;
} }
@ -2276,9 +2276,9 @@ void PlayerHandleExpUpdate(u32 battler)
static void PlayerHandleStatusXor(u32 battler) static void PlayerHandleStatusXor(u32 battler)
{ {
u32 val = GetMonData(GetPartyBattlerData(battler), MON_DATA_STATUS) ^ gBattleResources->bufferA[battler][1]; u32 val = GetMonData(GetBattlerMon(battler), MON_DATA_STATUS) ^ gBattleResources->bufferA[battler][1];
SetMonData(GetPartyBattlerData(battler), MON_DATA_STATUS, &val); SetMonData(GetBattlerMon(battler), MON_DATA_STATUS, &val);
PlayerBufferExecCompleted(battler); PlayerBufferExecCompleted(battler);
} }
@ -2449,7 +2449,7 @@ static bool32 ShouldShowTypeEffectiveness(u32 targetId)
static u32 CheckTypeEffectiveness(u32 targetId, u32 battler) static u32 CheckTypeEffectiveness(u32 targetId, u32 battler)
{ {
struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[battler][4]); struct ChooseMoveStruct *moveInfo = (struct ChooseMoveStruct *)(&gBattleResources->bufferA[battler][4]);
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u32 move = moveInfo->moves[gMoveSelectionCursor[battler]]; u32 move = moveInfo->moves[gMoveSelectionCursor[battler]];
u32 moveType = CheckDynamicMoveType(mon, move, battler); u32 moveType = CheckDynamicMoveType(mon, move, battler);
uq4_12_t modifier = CalcTypeEffectivenessMultiplier(move, moveType, battler, targetId, GetBattlerAbility(targetId), FALSE); uq4_12_t modifier = CalcTypeEffectivenessMultiplier(move, moveType, battler, targetId, GetBattlerAbility(targetId), FALSE);

12
src/battle_controller_player_partner.c
View File

@ -173,18 +173,18 @@ void Controller_PlayerPartnerShowIntroHealthbox(u32 battler)
&& ++gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay != 1) && ++gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay != 1)
{ {
gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 0; gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 0;
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]); DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
@ -232,9 +232,9 @@ static void SwitchIn_ShowHealthbox(u32 battler)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10); CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
@ -247,7 +247,7 @@ static void SwitchIn_TryShinyAnim(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy

20
src/battle_controller_recorded_opponent.c
View File

@ -205,7 +205,7 @@ static void TrySetBattlerShadowSpriteCallback(u32 battler)
|| P_GBA_STYLE_SPECIES_GFX == TRUE || P_GBA_STYLE_SPECIES_GFX == TRUE
|| gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback == SpriteCallbackDummy) || gSprites[gBattleSpritesDataPtr->healthBoxesData[battler].shadowSpriteIdSecondary].callback == SpriteCallbackDummy)
{ {
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
} }
} }
} }
@ -217,11 +217,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
{ {
@ -229,11 +229,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
} }
@ -307,7 +307,7 @@ static void TryShinyAnimAfterMonAnim(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim) if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
else else
{ {
@ -361,7 +361,7 @@ static void SwitchIn_ShowHealthbox(u32 battler)
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
CopyBattleSpriteInvisibility(battler); CopyBattleSpriteInvisibility(battler);
@ -373,13 +373,13 @@ static void SwitchIn_TryShinyAnim(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim) && !gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
SetBattlerShadowSpriteCallback(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); SetBattlerShadowSpriteCallback(battler, GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox; gBattlerControllerFuncs[battler] = SwitchIn_ShowHealthbox;
} }
} }
@ -501,7 +501,7 @@ static void RecordedOpponentHandleStatusIconUpdate(u32 battler)
{ {
DoStatusIconUpdate(battler); DoStatusIconUpdate(battler);
if (gTestRunnerEnabled) if (gTestRunnerEnabled)
TestRunner_Battle_RecordStatus1(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_STATUS)); TestRunner_Battle_RecordStatus1(battler, GetMonData(GetBattlerMon(battler), MON_DATA_STATUS));
} }
} }

20
src/battle_controller_recorded_player.c
View File

@ -167,9 +167,9 @@ static void Intro_WaitForShinyAnimAndHealthbox(u32 battler)
FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS); FreeSpriteTilesByTag(ANIM_TAG_GOLD_STARS);
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
if (IsDoubleBattle()) if (IsDoubleBattle())
HandleLowHpMusicChange(GetPartyBattlerData(BATTLE_PARTNER(battler)), BATTLE_PARTNER(battler)); HandleLowHpMusicChange(GetBattlerMon(BATTLE_PARTNER(battler)), BATTLE_PARTNER(battler));
gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 3; gBattleSpritesDataPtr->healthBoxesData[battler].introEndDelay = 3;
gBattlerControllerFuncs[battler] = Intro_DelayAndEnd; gBattlerControllerFuncs[battler] = Intro_DelayAndEnd;
@ -210,11 +210,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
} }
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
@ -224,11 +224,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
} }
@ -309,9 +309,9 @@ static void SwitchIn_ShowHealthbox(u32 battler)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10); CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
@ -324,7 +324,7 @@ static void SwitchIn_TryShinyAnim(u32 battler)
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
{ {
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
} }
if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy if (gSprites[gBattleControllerData[battler]].callback == SpriteCallbackDummy
@ -494,7 +494,7 @@ static void RecordedPlayerHandleStatusIconUpdate(u32 battler)
{ {
DoStatusIconUpdate(battler); DoStatusIconUpdate(battler);
if (gTestRunnerEnabled) if (gTestRunnerEnabled)
TestRunner_Battle_RecordStatus1(battler, GetMonData(GetPartyBattlerData(battler), MON_DATA_STATUS)); TestRunner_Battle_RecordStatus1(battler, GetMonData(GetBattlerMon(battler), MON_DATA_STATUS));
} }
} }

6
src/battle_controller_safari.c
View File

@ -307,7 +307,7 @@ static void SafariHandleChooseItem(u32 battler)
static void SafariHandleStatusIconUpdate(u32 battler) static void SafariHandleStatusIconUpdate(u32 battler)
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_SAFARI_BALLS_TEXT); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_SAFARI_BALLS_TEXT);
SafariBufferExecCompleted(battler); SafariBufferExecCompleted(battler);
} }
@ -315,7 +315,7 @@ static void SafariHandleStatusIconUpdate(u32 battler)
// Player is not a pokemon, so it can't really faint in the Safari anyway. // Player is not a pokemon, so it can't really faint in the Safari anyway.
static void SafariHandleFaintingCry(u32 battler) static void SafariHandleFaintingCry(u32 battler)
{ {
u16 species = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES); u16 species = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES);
PlayCry_Normal(species, 25); PlayCry_Normal(species, 25);
SafariBufferExecCompleted(battler); SafariBufferExecCompleted(battler);
@ -324,7 +324,7 @@ static void SafariHandleFaintingCry(u32 battler)
static void SafariHandleIntroTrainerBallThrow(u32 battler) static void SafariHandleIntroTrainerBallThrow(u32 battler)
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_SAFARI_ALL_TEXT); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_SAFARI_ALL_TEXT);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
gBattlerControllerFuncs[battler] = Controller_WaitForHealthbox; gBattlerControllerFuncs[battler] = Controller_WaitForHealthbox;

12
src/battle_controller_wally.c
View File

@ -218,11 +218,11 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
{ {
if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[battler].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive)
TryShinyAnimation(battler, GetPartyBattlerData(battler)); TryShinyAnimation(battler, GetBattlerMon(battler));
if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim if (!gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].triedShinyMonAnim
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive) && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive)
TryShinyAnimation(BATTLE_PARTNER(battler), GetPartyBattlerData(BATTLE_PARTNER(battler))); TryShinyAnimation(BATTLE_PARTNER(battler), GetBattlerMon(BATTLE_PARTNER(battler)));
if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive if (!gBattleSpritesDataPtr->healthBoxesData[battler].ballAnimActive
&& !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive && !gBattleSpritesDataPtr->healthBoxesData[BATTLE_PARTNER(battler)].ballAnimActive
@ -232,12 +232,12 @@ static void Intro_TryShinyAnimShowHealthbox(u32 battler)
if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI)) if (IsDoubleBattle() && !(gBattleTypeFlags & BATTLE_TYPE_MULTI))
{ {
DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]); DestroySprite(&gSprites[gBattleControllerData[BATTLE_PARTNER(battler)]]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetPartyBattlerData(BATTLE_PARTNER(battler)), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[BATTLE_PARTNER(battler)], GetBattlerMon(BATTLE_PARTNER(battler)), HEALTHBOX_ALL);
StartHealthboxSlideIn(BATTLE_PARTNER(battler)); StartHealthboxSlideIn(BATTLE_PARTNER(battler));
SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[BATTLE_PARTNER(battler)]);
} }
DestroySprite(&gSprites[gBattleControllerData[battler]]); DestroySprite(&gSprites[gBattleControllerData[battler]]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
StartHealthboxSlideIn(battler); StartHealthboxSlideIn(battler);
SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteVisible(gHealthboxSpriteIds[battler]);
@ -266,7 +266,7 @@ static void Intro_WaitForShinyAnimAndHealthbox(u32 battler)
FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS); FreeSpritePaletteByTag(ANIM_TAG_GOLD_STARS);
CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10); CreateTask(Task_PlayerController_RestoreBgmAfterCry, 10);
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
WallyBufferExecCompleted(battler); WallyBufferExecCompleted(battler);
} }
@ -408,7 +408,7 @@ static void WallyHandlePlaySE(u32 battler)
// Wally's Pokémon during the tutorial is never intended to faint, so that's probably why it's different here. // Wally's Pokémon during the tutorial is never intended to faint, so that's probably why it's different here.
static void WallyHandleFaintingCry(u32 battler) static void WallyHandleFaintingCry(u32 battler)
{ {
u16 species = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES); u16 species = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES);
PlayCry_Normal(species, 25); PlayCry_Normal(species, 25);
WallyBufferExecCompleted(battler); WallyBufferExecCompleted(battler);

32
src/battle_controllers.c
View File

@ -2079,7 +2079,7 @@ static bool8 ShouldDoSlideInAnim(u32 battler)
) )
return FALSE; return FALSE;
if (GetFirstLiveMon() != GetPartyBattlerData(battler)) if (GetFirstLiveMon() != GetBattlerMon(battler))
return FALSE; return FALSE;
return TRUE; return TRUE;
@ -2089,7 +2089,7 @@ void StartSendOutAnim(u32 battler, bool32 dontClearTransform, bool32 dontClearSu
{ {
u16 species; u16 species;
u32 side = GetBattlerSide(battler); u32 side = GetBattlerSide(battler);
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
ClearTemporarySpeciesSpriteData(battler, dontClearTransform, dontClearSubstituteBit); ClearTemporarySpeciesSpriteData(battler, dontClearTransform, dontClearSubstituteBit);
gBattlerPartyIndexes[battler] = gBattleResources->bufferA[battler][1]; gBattlerPartyIndexes[battler] = gBattleResources->bufferA[battler][1];
@ -2163,7 +2163,7 @@ static void Controller_FaintPlayerMon(u32 battler)
u32 spriteId = gBattlerSpriteIds[battler]; u32 spriteId = gBattlerSpriteIds[battler];
if (gSprites[spriteId].y + gSprites[spriteId].y2 > DISPLAY_HEIGHT) if (gSprites[spriteId].y + gSprites[spriteId].y2 > DISPLAY_HEIGHT)
{ {
BattleGfxSfxDummy2(GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)); BattleGfxSfxDummy2(GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES));
FreeOamMatrix(gSprites[spriteId].oam.matrixNum); FreeOamMatrix(gSprites[spriteId].oam.matrixNum);
DestroySprite(&gSprites[spriteId]); DestroySprite(&gSprites[spriteId]);
SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]);
@ -2254,7 +2254,7 @@ void Controller_WaitForHealthBar(u32 battler)
else else
{ {
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
BattleControllerComplete(battler); BattleControllerComplete(battler);
} }
} }
@ -2362,7 +2362,7 @@ void BtlController_HandleGetMonData(u32 battler)
void BtlController_HandleGetRawMonData(u32 battler) void BtlController_HandleGetRawMonData(u32 battler)
{ {
struct BattlePokemon battleMon; struct BattlePokemon battleMon;
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u8 *src = (u8 *)mon + gBattleResources->bufferA[battler][1]; u8 *src = (u8 *)mon + gBattleResources->bufferA[battler][1];
u8 *dst = (u8 *)&battleMon + gBattleResources->bufferA[battler][1]; u8 *dst = (u8 *)&battleMon + gBattleResources->bufferA[battler][1];
@ -2400,7 +2400,7 @@ void BtlController_HandleSetMonData(u32 battler)
void BtlController_HandleSetRawMonData(u32 battler) void BtlController_HandleSetRawMonData(u32 battler)
{ {
u32 i; u32 i;
u8 *dst = (u8 *)GetPartyBattlerData(battler) + gBattleResources->bufferA[battler][1]; u8 *dst = (u8 *)GetBattlerMon(battler) + gBattleResources->bufferA[battler][1];
for (i = 0; i < gBattleResources->bufferA[battler][2]; i++) for (i = 0; i < gBattleResources->bufferA[battler][2]; i++)
dst[i] = gBattleResources->bufferA[battler][3 + i]; dst[i] = gBattleResources->bufferA[battler][3 + i];
@ -2410,7 +2410,7 @@ void BtlController_HandleSetRawMonData(u32 battler)
void BtlController_HandleLoadMonSprite(u32 battler, void (*controllerCallback)(u32 battler)) void BtlController_HandleLoadMonSprite(u32 battler, void (*controllerCallback)(u32 battler))
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u16 species = GetMonData(mon, MON_DATA_SPECIES); u16 species = GetMonData(mon, MON_DATA_SPECIES);
BattleLoadMonSpriteGfx(mon, battler); BattleLoadMonSpriteGfx(mon, battler);
@ -2438,7 +2438,7 @@ void BtlController_HandleSwitchInAnim(u32 battler, bool32 isPlayerSide, void (*c
ClearTemporarySpeciesSpriteData(battler, gBattleResources->bufferA[battler][2], gBattleResources->bufferA[battler][3]); ClearTemporarySpeciesSpriteData(battler, gBattleResources->bufferA[battler][2], gBattleResources->bufferA[battler][3]);
gBattlerPartyIndexes[battler] = gBattleResources->bufferA[battler][1]; gBattlerPartyIndexes[battler] = gBattleResources->bufferA[battler][1];
if (isPlayerSide) if (isPlayerSide)
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
StartSendOutAnim(battler, gBattleResources->bufferA[battler][2], gBattleResources->bufferA[battler][3], FALSE); StartSendOutAnim(battler, gBattleResources->bufferA[battler][2], gBattleResources->bufferA[battler][3], FALSE);
gBattlerControllerFuncs[battler] = controllerCallback; gBattlerControllerFuncs[battler] = controllerCallback;
} }
@ -2593,7 +2593,7 @@ void BtlController_HandleFaintAnimation(u32 battler)
gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0; gBattleSpritesDataPtr->healthBoxesData[battler].animationState = 0;
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
{ {
HandleLowHpMusicChange(GetPartyBattlerData(battler), battler); HandleLowHpMusicChange(GetBattlerMon(battler), battler);
gSprites[gBattlerSpriteIds[battler]].sSpeedX = 0; gSprites[gBattlerSpriteIds[battler]].sSpeedX = 0;
gSprites[gBattlerSpriteIds[battler]].sSpeedY = 5; gSprites[gBattlerSpriteIds[battler]].sSpeedY = 5;
PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER); PlaySE12WithPanning(SE_FAINT, SOUND_PAN_ATTACKER);
@ -2690,7 +2690,7 @@ void BtlController_HandleHealthBarUpdate(u32 battler, bool32 updateHpText)
{ {
s32 maxHP, curHP; s32 maxHP, curHP;
s16 hpVal; s16 hpVal;
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
LoadBattleBarGfx(0); LoadBattleBarGfx(0);
hpVal = gBattleResources->bufferA[battler][2] | (gBattleResources->bufferA[battler][3] << 8); hpVal = gBattleResources->bufferA[battler][2] | (gBattleResources->bufferA[battler][3] << 8);
@ -2715,7 +2715,7 @@ void BtlController_HandleHealthBarUpdate(u32 battler, bool32 updateHpText)
void DoStatusIconUpdate(u32 battler) void DoStatusIconUpdate(u32 battler)
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], mon, HEALTHBOX_STATUS_ICON); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], mon, HEALTHBOX_STATUS_ICON);
gBattleSpritesDataPtr->healthBoxesData[battler].statusAnimActive = 0; gBattleSpritesDataPtr->healthBoxesData[battler].statusAnimActive = 0;
@ -2817,14 +2817,14 @@ void BtlController_HandleSpriteInvisibility(u32 battler)
bool32 TwoPlayerIntroMons(u32 battler) // Double battle with both player pokemon active. bool32 TwoPlayerIntroMons(u32 battler) // Double battle with both player pokemon active.
{ {
return (IsDoubleBattle() && IsValidForBattle(GetPartyBattlerData(battler ^ BIT_FLANK))); return (IsDoubleBattle() && IsValidForBattle(GetBattlerMon(battler ^ BIT_FLANK)));
} }
bool32 TwoOpponentIntroMons(u32 battler) // Double battle with both opponent pokemon active. bool32 TwoOpponentIntroMons(u32 battler) // Double battle with both opponent pokemon active.
{ {
return (IsDoubleBattle() return (IsDoubleBattle()
&& IsValidForBattle(GetPartyBattlerData(battler)) && IsValidForBattle(GetBattlerMon(battler))
&& IsValidForBattle(GetPartyBattlerData(BATTLE_PARTNER(battler)))); && IsValidForBattle(GetBattlerMon(BATTLE_PARTNER(battler))));
} }
// Task data for Task_StartSendOutAnim // Task data for Task_StartSendOutAnim
@ -2924,7 +2924,7 @@ static void Task_StartSendOutAnim(u8 taskId)
battlerPartner = battler ^ BIT_FLANK; battlerPartner = battler ^ BIT_FLANK;
gBattleResources->bufferA[battlerPartner][1] = gBattlerPartyIndexes[battlerPartner]; gBattleResources->bufferA[battlerPartner][1] = gBattlerPartyIndexes[battlerPartner];
BattleLoadMonSpriteGfx(GetPartyBattlerData(battlerPartner), battlerPartner); BattleLoadMonSpriteGfx(GetBattlerMon(battlerPartner), battlerPartner);
StartSendOutAnim(battlerPartner, FALSE, FALSE, ShouldDoSlideInAnim(battler)); StartSendOutAnim(battlerPartner, FALSE, FALSE, ShouldDoSlideInAnim(battler));
} }
else else
@ -2953,7 +2953,7 @@ static void SpriteCB_FreePlayerSpriteLoadMonSprite(struct Sprite *sprite)
DestroySprite(sprite); DestroySprite(sprite);
// Load mon sprite // Load mon sprite
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
} }

6
src/battle_debug.c
View File

@ -1046,7 +1046,7 @@ static void Task_ShowAiPoints(u8 taskId)
data->spriteIds.aiIconSpriteIds[i] = 0xFF; data->spriteIds.aiIconSpriteIds[i] = 0xFF;
} }
} }
mon = GetPartyBattlerData(data->aiBattlerId); mon = GetBattlerMon(data->aiBattlerId);
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
GetMonData(mon, MON_DATA_IS_SHINY), GetMonData(mon, MON_DATA_IS_SHINY),
@ -1227,7 +1227,7 @@ static void Task_ShowAiKnowledge(u8 taskId)
} }
} }
mon = GetPartyBattlerData(data->aiBattlerId); mon = GetBattlerMon(data->aiBattlerId);
data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species, data->aiMonSpriteId = CreateMonPicSprite(gBattleMons[data->aiBattlerId].species,
GetMonData(mon, MON_DATA_IS_SHINY), GetMonData(mon, MON_DATA_IS_SHINY),
@ -2295,7 +2295,7 @@ static void UpdateMonData(struct BattleDebugMenu *data)
{ {
if (data->battlerWasChanged[i]) if (data->battlerWasChanged[i])
{ {
struct Pokemon *mon = GetPartyBattlerData(i); struct Pokemon *mon = GetBattlerMon(i);
struct BattlePokemon *battleMon = &gBattleMons[i]; struct BattlePokemon *battleMon = &gBattleMons[i];
SetMonData(mon, MON_DATA_HELD_ITEM, &battleMon->item); SetMonData(mon, MON_DATA_HELD_ITEM, &battleMon->item);

10
src/battle_dynamax.c
View File

@ -123,7 +123,7 @@ bool32 CanDynamax(u32 battler)
// Returns whether a battler is transformed into a Gigantamax form. // Returns whether a battler is transformed into a Gigantamax form.
bool32 IsGigantamaxed(u32 battler) bool32 IsGigantamaxed(u32 battler)
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
if ((gSpeciesInfo[gBattleMons[battler].species].isGigantamax) && GetMonData(mon, MON_DATA_GIGANTAMAX_FACTOR)) if ((gSpeciesInfo[gBattleMons[battler].species].isGigantamax) && GetMonData(mon, MON_DATA_GIGANTAMAX_FACTOR))
return TRUE; return TRUE;
return FALSE; return FALSE;
@ -151,7 +151,7 @@ u16 GetNonDynamaxHP(u32 battler)
return gBattleMons[battler].hp; return gBattleMons[battler].hp;
else else
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE); uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE);
u32 hp = UQ_4_12_TO_INT((gBattleMons[battler].hp * mult) + UQ_4_12_ROUND); u32 hp = UQ_4_12_TO_INT((gBattleMons[battler].hp * mult) + UQ_4_12_ROUND);
return hp; return hp;
@ -165,7 +165,7 @@ u16 GetNonDynamaxMaxHP(u32 battler)
return gBattleMons[battler].maxHP; return gBattleMons[battler].maxHP;
else else
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE); uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE);
u32 maxHP = UQ_4_12_TO_INT((gBattleMons[battler].maxHP * mult) + UQ_4_12_ROUND); u32 maxHP = UQ_4_12_TO_INT((gBattleMons[battler].maxHP * mult) + UQ_4_12_ROUND);
return maxHP; return maxHP;
@ -200,7 +200,7 @@ void UndoDynamax(u32 battler)
// Revert HP if battler is still Dynamaxed. // Revert HP if battler is still Dynamaxed.
if (GetActiveGimmick(battler) == GIMMICK_DYNAMAX) if (GetActiveGimmick(battler) == GIMMICK_DYNAMAX)
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE); uq4_12_t mult = GetDynamaxLevelHPMultiplier(GetMonData(mon, MON_DATA_DYNAMAX_LEVEL), TRUE);
gBattleMons[battler].hp = UQ_4_12_TO_INT((GetMonData(mon, MON_DATA_HP) * mult + 1) + UQ_4_12_ROUND); // round up gBattleMons[battler].hp = UQ_4_12_TO_INT((GetMonData(mon, MON_DATA_HP) * mult + 1) + UQ_4_12_ROUND); // round up
SetMonData(mon, MON_DATA_HP, &gBattleMons[battler].hp); SetMonData(mon, MON_DATA_HP, &gBattleMons[battler].hp);
@ -476,7 +476,7 @@ void BS_UpdateDynamax(void)
{ {
NATIVE_ARGS(); NATIVE_ARGS();
u32 battler = gBattleScripting.battler; u32 battler = gBattleScripting.battler;
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
if (!IsGigantamaxed(battler)) // RecalcBattlerStats will get called on form change. if (!IsGigantamaxed(battler)) // RecalcBattlerStats will get called on form change.
RecalcBattlerStats(battler, mon, GetActiveGimmick(battler) == GIMMICK_DYNAMAX); RecalcBattlerStats(battler, mon, GetActiveGimmick(battler) == GIMMICK_DYNAMAX);

10
src/battle_gfx_sfx_util.c
View File

@ -872,11 +872,11 @@ bool8 BattleInitAllSprites(u8 *state1, u8 *battler)
if (GetBattlerSide(*battler) == B_SIDE_PLAYER) if (GetBattlerSide(*battler) == B_SIDE_PLAYER)
{ {
if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
UpdateHealthboxAttribute(gHealthboxSpriteIds[*battler], GetPartyBattlerData(*battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[*battler], GetBattlerMon(*battler), HEALTHBOX_ALL);
} }
else else
{ {
UpdateHealthboxAttribute(gHealthboxSpriteIds[*battler], GetPartyBattlerData(*battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[*battler], GetBattlerMon(*battler), HEALTHBOX_ALL);
} }
SetHealthboxSpriteInvisible(gHealthboxSpriteIds[*battler]); SetHealthboxSpriteInvisible(gHealthboxSpriteIds[*battler]);
(*battler)++; (*battler)++;
@ -927,8 +927,8 @@ void HandleSpeciesGfxDataChange(u8 battlerAtk, u8 battlerDef, bool32 megaEvo, bo
bool32 isShiny; bool32 isShiny;
const void *src; const void *src;
const u16 *paletteData; const u16 *paletteData;
struct Pokemon *monAtk = GetPartyBattlerData(battlerAtk); struct Pokemon *monAtk = GetBattlerMon(battlerAtk);
struct Pokemon *monDef = GetPartyBattlerData(battlerDef); struct Pokemon *monDef = GetBattlerMon(battlerDef);
void *dst; void *dst;
if (IsContest()) if (IsContest())
@ -1044,7 +1044,7 @@ void BattleLoadSubstituteOrMonSpriteGfx(u8 battler, bool8 loadMonSprite)
else else
{ {
if (!IsContest()) if (!IsContest())
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
} }
} }

20
src/battle_interface.c
View File

@ -1179,8 +1179,8 @@ void SwapHpBarsWithHpText(void)
&& GetBattlerSide(i) != B_SIDE_OPPONENT && GetBattlerSide(i) != B_SIDE_OPPONENT
&& (GetBattlerCoordsIndex(i) != BATTLE_COORDS_SINGLES || GetBattlerSide(i) != B_SIDE_PLAYER)) && (GetBattlerCoordsIndex(i) != BATTLE_COORDS_SINGLES || GetBattlerSide(i) != B_SIDE_PLAYER))
{ {
s32 currHp = GetMonData(GetPartyBattlerData(i), MON_DATA_HP); s32 currHp = GetMonData(GetBattlerMon(i), MON_DATA_HP);
s32 maxHp = GetMonData(GetPartyBattlerData(i), MON_DATA_MAX_HP); s32 maxHp = GetMonData(GetBattlerMon(i), MON_DATA_MAX_HP);
bool8 noBars; bool8 noBars;
gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars ^= 1; gBattleSpritesDataPtr->battlerData[i].hpNumbersNoBars ^= 1;
@ -1202,7 +1202,7 @@ void SwapHpBarsWithHpText(void)
else // text to bars else // text to bars
{ {
UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]); UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetPartyBattlerData(i), HEALTHBOX_HEALTH_BAR); UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetBattlerMon(i), HEALTHBOX_HEALTH_BAR);
CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32); CpuCopy32(GetHealthboxElementGfxPtr(HEALTHBOX_GFX_FRAME_END_BAR), (void *)(OBJ_VRAM0 + 0x680 + gSprites[gHealthboxSpriteIds[i]].oam.tileNum * TILE_SIZE_4BPP), 32);
} }
} }
@ -1213,7 +1213,7 @@ void SwapHpBarsWithHpText(void)
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
{ {
// Most likely a debug function. // Most likely a debug function.
PrintSafariMonInfo(gHealthboxSpriteIds[i], GetPartyBattlerData(i)); PrintSafariMonInfo(gHealthboxSpriteIds[i], GetBattlerMon(i));
} }
else else
{ {
@ -1226,9 +1226,9 @@ void SwapHpBarsWithHpText(void)
else // text to bars else // text to bars
{ {
UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]); UpdateStatusIconInHealthbox(gHealthboxSpriteIds[i]);
UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetPartyBattlerData(i), HEALTHBOX_HEALTH_BAR); UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetBattlerMon(i), HEALTHBOX_HEALTH_BAR);
if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetPartyBattlerData(i), HEALTHBOX_NICK); UpdateHealthboxAttribute(gHealthboxSpriteIds[i], GetBattlerMon(i), HEALTHBOX_NICK);
} }
} }
gSprites[gHealthboxSpriteIds[i]].hMain_Data7 ^= 1; gSprites[gHealthboxSpriteIds[i]].hMain_Data7 ^= 1;
@ -1783,7 +1783,7 @@ static void TryAddPokeballIconToHealthbox(u8 healthboxSpriteId, bool8 noStatus)
battlerId = gSprites[healthboxSpriteId].hMain_Battler; battlerId = gSprites[healthboxSpriteId].hMain_Battler;
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
return; return;
if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(GetPartyBattlerData(battlerId), MON_DATA_SPECIES)), FLAG_GET_CAUGHT)) if (!GetSetPokedexFlag(SpeciesToNationalPokedexNum(GetMonData(GetBattlerMon(battlerId), MON_DATA_SPECIES)), FLAG_GET_CAUGHT))
return; return;
healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
@ -1807,7 +1807,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId; healthBarSpriteId = gSprites[healthboxSpriteId].hMain_HealthBarSpriteId;
if (GetBattlerSide(battlerId) == B_SIDE_PLAYER) if (GetBattlerSide(battlerId) == B_SIDE_PLAYER)
{ {
status = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_STATUS); status = GetMonData(GetBattlerMon(battlerId), MON_DATA_STATUS);
switch (GetBattlerCoordsIndex(battlerId)) switch (GetBattlerCoordsIndex(battlerId))
{ {
case BATTLE_COORDS_SINGLES: case BATTLE_COORDS_SINGLES:
@ -1820,7 +1820,7 @@ static void UpdateStatusIconInHealthbox(u8 healthboxSpriteId)
} }
else else
{ {
status = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_STATUS); status = GetMonData(GetBattlerMon(battlerId), MON_DATA_STATUS);
tileNumAdder = 0x11; tileNumAdder = 0x11;
} }
@ -2144,7 +2144,7 @@ static void MoveBattleBarGraphically(u8 battlerId, u8 whichBar)
gBattleSpritesDataPtr->battleBars[battlerId].receivedValue, gBattleSpritesDataPtr->battleBars[battlerId].receivedValue,
&gBattleSpritesDataPtr->battleBars[battlerId].currValue, &gBattleSpritesDataPtr->battleBars[battlerId].currValue,
array, B_EXPBAR_PIXELS / 8); array, B_EXPBAR_PIXELS / 8);
level = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_LEVEL); level = GetMonData(GetBattlerMon(battlerId), MON_DATA_LEVEL);
if (level >= MAX_LEVEL) if (level >= MAX_LEVEL)
{ {
for (i = 0; i < 8; i++) for (i = 0; i < 8; i++)

18
src/battle_main.c
View File

@ -2669,7 +2669,7 @@ void SpriteCallbackDummy_2(struct Sprite *sprite)
void SpriteCB_FaintOpponentMon(struct Sprite *sprite) void SpriteCB_FaintOpponentMon(struct Sprite *sprite)
{ {
u8 battler = sprite->sBattler; u8 battler = sprite->sBattler;
u32 personality = GetMonData(GetPartyBattlerData(battler), MON_DATA_PERSONALITY); u32 personality = GetMonData(GetBattlerMon(battler), MON_DATA_PERSONALITY);
u16 species; u16 species;
u8 yOffset; u8 yOffset;
@ -3480,7 +3480,7 @@ static void DoBattleIntro(void)
{ {
BtlController_EmitLoadMonSprite(battler, BUFFER_A); BtlController_EmitLoadMonSprite(battler, BUFFER_A);
MarkBattlerForControllerExec(battler); MarkBattlerForControllerExec(battler);
gBattleResults.lastOpponentSpecies = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES, NULL); gBattleResults.lastOpponentSpecies = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES, NULL);
} }
break; break;
case B_POSITION_PLAYER_RIGHT: case B_POSITION_PLAYER_RIGHT:
@ -3503,7 +3503,7 @@ static void DoBattleIntro(void)
{ {
BtlController_EmitLoadMonSprite(battler, BUFFER_A); BtlController_EmitLoadMonSprite(battler, BUFFER_A);
MarkBattlerForControllerExec(battler); MarkBattlerForControllerExec(battler);
gBattleResults.lastOpponentSpecies = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES, NULL); gBattleResults.lastOpponentSpecies = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES, NULL);
} }
break; break;
} }
@ -3739,7 +3739,7 @@ static void TryDoEventsBeforeFirstTurn(void)
for (i = 0; i < gBattlersCount; i++) for (i = 0; i < gBattlersCount; i++)
{ {
gBattleStruct->monToSwitchIntoId[i] = PARTY_SIZE; // Included here because switches can happen before during set ups (eg. eject pack) gBattleStruct->monToSwitchIntoId[i] = PARTY_SIZE; // Included here because switches can happen before during set ups (eg. eject pack)
struct Pokemon *mon = GetPartyBattlerData(i); struct Pokemon *mon = GetBattlerMon(i);
if (!IsBattlerAlive(i) || gBattleMons[i].species == SPECIES_NONE || GetMonData(mon, MON_DATA_IS_EGG)) if (!IsBattlerAlive(i) || gBattleMons[i].species == SPECIES_NONE || GetMonData(mon, MON_DATA_IS_EGG))
gAbsentBattlerFlags |= 1u << i; gAbsentBattlerFlags |= 1u << i;
} }
@ -5507,13 +5507,13 @@ static void HandleEndTurn_FinishBattle(void)
{ {
if (gBattleResults.playerMon1Species == SPECIES_NONE) if (gBattleResults.playerMon1Species == SPECIES_NONE)
{ {
gBattleResults.playerMon1Species = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES, NULL); gBattleResults.playerMon1Species = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES, NULL);
GetMonData(GetPartyBattlerData(battler), MON_DATA_NICKNAME, gBattleResults.playerMon1Name); GetMonData(GetBattlerMon(battler), MON_DATA_NICKNAME, gBattleResults.playerMon1Name);
} }
else else
{ {
gBattleResults.playerMon2Species = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES, NULL); gBattleResults.playerMon2Species = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES, NULL);
GetMonData(GetPartyBattlerData(battler), MON_DATA_NICKNAME, gBattleResults.playerMon2Name); GetMonData(GetBattlerMon(battler), MON_DATA_NICKNAME, gBattleResults.playerMon2Name);
} }
} }
else if (GetBattlerSide(battler) == B_SIDE_OPPONENT) else if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
@ -6027,7 +6027,7 @@ void SetTypeBeforeUsingMove(u32 move, u32 battler)
gBattleStruct->ateBoost[battler] = FALSE; gBattleStruct->ateBoost[battler] = FALSE;
gSpecialStatuses[battler].gemBoost = FALSE; gSpecialStatuses[battler].gemBoost = FALSE;
moveType = GetDynamicMoveType(GetPartyBattlerData(battler), moveType = GetDynamicMoveType(GetBattlerMon(battler),
move, move,
battler, battler,
&gBattleStruct->ateBoost[battler]); &gBattleStruct->ateBoost[battler]);

10
src/battle_message.c
View File

@ -2121,7 +2121,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
{ {
if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY) if (gBattleTypeFlags & BATTLE_TYPE_LEGENDARY)
stringPtr = sText_LegendaryPkmnAppeared; stringPtr = sText_LegendaryPkmnAppeared;
else if (IsDoubleBattle() && IsValidForBattle(GetPartyBattlerData(GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT)))) else if (IsDoubleBattle() && IsValidForBattle(GetBattlerMon(GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT))))
stringPtr = sText_TwoWildPkmnAppeared; stringPtr = sText_TwoWildPkmnAppeared;
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL) else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL)
stringPtr = sText_WildPkmnAppearedPause; stringPtr = sText_WildPkmnAppearedPause;
@ -2132,7 +2132,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
case STRINGID_INTROSENDOUT: // poke first send-out case STRINGID_INTROSENDOUT: // poke first send-out
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
{ {
if (IsDoubleBattle() && IsValidForBattle(GetPartyBattlerData(BATTLE_PARTNER(battler)))) if (IsDoubleBattle() && IsValidForBattle(GetBattlerMon(BATTLE_PARTNER(battler))))
{ {
if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER) if (gBattleTypeFlags & BATTLE_TYPE_INGAME_PARTNER)
stringPtr = sText_InGamePartnerSentOutZGoN; stringPtr = sText_InGamePartnerSentOutZGoN;
@ -2150,7 +2150,7 @@ void BufferStringBattle(enum StringID stringID, u32 battler)
} }
else else
{ {
if (IsDoubleBattle() && IsValidForBattle(GetPartyBattlerData(BATTLE_PARTNER(battler)))) if (IsDoubleBattle() && IsValidForBattle(GetBattlerMon(BATTLE_PARTNER(battler))))
{ {
if (BATTLE_TWO_VS_ONE_OPPONENT) if (BATTLE_TWO_VS_ONE_OPPONENT)
stringPtr = sText_Trainer1SentOutTwoPkmn; stringPtr = sText_Trainer1SentOutTwoPkmn;
@ -2399,7 +2399,7 @@ static const u8 *TryGetStatusString(u8 *src)
static void GetBattlerNick(u32 battler, u8 *dst) static void GetBattlerNick(u32 battler, u8 *dst)
{ {
struct Pokemon *illusionMon = GetIllusionMonPtr(battler); struct Pokemon *illusionMon = GetIllusionMonPtr(battler);
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
if (illusionMon != NULL) if (illusionMon != NULL)
mon = illusionMon; mon = illusionMon;
@ -3180,7 +3180,7 @@ static void IllusionNickHack(u32 battler, u32 partyId, u8 *dst)
if (GetMonAbility(mon) == ABILITY_ILLUSION) if (GetMonAbility(mon) == ABILITY_ILLUSION)
{ {
if (IsBattlerAlive(BATTLE_PARTNER(battler))) if (IsBattlerAlive(BATTLE_PARTNER(battler)))
partnerMon = GetPartyBattlerData(BATTLE_PARTNER(battler)); partnerMon = GetBattlerMon(BATTLE_PARTNER(battler));
else else
partnerMon = mon; partnerMon = mon;

92
src/battle_script_commands.c
View File

@ -3881,7 +3881,7 @@ void SetMoveEffect(bool32 primary, bool32 certain)
case MOVE_EFFECT_SYRUP_BOMB: case MOVE_EFFECT_SYRUP_BOMB:
if (!(gStatuses4[gEffectBattler] & STATUS4_SYRUP_BOMB)) if (!(gStatuses4[gEffectBattler] & STATUS4_SYRUP_BOMB))
{ {
struct Pokemon *mon = GetPartyBattlerData(gBattlerAttacker); struct Pokemon *mon = GetBattlerMon(gBattlerAttacker);
gStatuses4[gEffectBattler] |= STATUS4_SYRUP_BOMB; gStatuses4[gEffectBattler] |= STATUS4_SYRUP_BOMB;
gDisableStructs[gEffectBattler].syrupBombTimer = 3; gDisableStructs[gEffectBattler].syrupBombTimer = 3;
@ -4615,7 +4615,7 @@ static void Cmd_tryfaintmon(void)
{ {
if (gBattleResults.opponentFaintCounter < 255) if (gBattleResults.opponentFaintCounter < 255)
gBattleResults.opponentFaintCounter++; gBattleResults.opponentFaintCounter++;
gBattleResults.lastOpponentSpecies = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES, NULL); gBattleResults.lastOpponentSpecies = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES, NULL);
gSideTimers[B_SIDE_OPPONENT].retaliateTimer = 2; gSideTimers[B_SIDE_OPPONENT].retaliateTimer = 2;
} }
if ((gHitMarker & HITMARKER_DESTINYBOND) && IsBattlerAlive(gBattlerAttacker) if ((gHitMarker & HITMARKER_DESTINYBOND) && IsBattlerAlive(gBattlerAttacker)
@ -5132,7 +5132,7 @@ static void Cmd_getexp(void)
{ {
u16 temp, battler = 0xFF; u16 temp, battler = 0xFF;
if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[expBattler] == *expMonId) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && gBattlerPartyIndexes[expBattler] == *expMonId)
HandleLowHpMusicChange(GetPartyBattlerData(expBattler), expBattler); HandleLowHpMusicChange(GetBattlerMon(expBattler), expBattler);
PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, expBattler, *expMonId); PREPARE_MON_NICK_WITH_PREFIX_BUFFER(gBattleTextBuff1, expBattler, *expMonId);
PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[*expMonId], MON_DATA_LEVEL)); PREPARE_BYTE_NUMBER_BUFFER(gBattleTextBuff2, 3, GetMonData(&gPlayerParty[*expMonId], MON_DATA_LEVEL));
@ -9583,7 +9583,7 @@ static void Cmd_useitemonopponent(void)
CMD_ARGS(); CMD_ARGS();
gBattlerInMenuId = gBattlerAttacker; gBattlerInMenuId = gBattlerAttacker;
PokemonUseItemEffects(GetPartyBattlerData(gBattlerAttacker), gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, TRUE); PokemonUseItemEffects(GetBattlerMon(gBattlerAttacker), gLastUsedItem, gBattlerPartyIndexes[gBattlerAttacker], 0, TRUE);
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;
} }
@ -9913,7 +9913,7 @@ void BS_CourtChangeSwapSideStatuses(void)
static void HandleScriptMegaPrimalBurst(u32 caseId, u32 battler, u32 type) static void HandleScriptMegaPrimalBurst(u32 caseId, u32 battler, u32 type)
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u32 side = GetBattlerSide(battler); u32 side = GetBattlerSide(battler);
// Change species. // Change species.
@ -10185,9 +10185,9 @@ static void Cmd_various(void)
{ {
VARIOUS_ARGS(); VARIOUS_ARGS();
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
mon = GetPartyBattlerData(battler); mon = GetBattlerMon(battler);
else else
mon = GetPartyBattlerData(battler); mon = GetBattlerMon(battler);
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], mon, HEALTHBOX_NICK); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], mon, HEALTHBOX_NICK);
break; break;
} }
@ -10498,7 +10498,7 @@ static void Cmd_various(void)
gAbsentBattlerFlags |= 1u << battler; gAbsentBattlerFlags |= 1u << battler;
gHitMarker |= HITMARKER_FAINTED(battler); gHitMarker |= HITMARKER_FAINTED(battler);
gBattleMons[battler].hp = 0; gBattleMons[battler].hp = 0;
SetMonData(GetPartyBattlerData(battler), MON_DATA_HP, &gBattleMons[battler].hp); SetMonData(GetBattlerMon(battler), MON_DATA_HP, &gBattleMons[battler].hp);
SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]); SetHealthboxSpriteInvisible(gHealthboxSpriteIds[battler]);
FaintClearSetData(battler); FaintClearSetData(battler);
} }
@ -10778,7 +10778,7 @@ static void Cmd_various(void)
case VARIOUS_HANDLE_FORM_CHANGE: case VARIOUS_HANDLE_FORM_CHANGE:
{ {
VARIOUS_ARGS(u8 case_); VARIOUS_ARGS(u8 case_);
mon = GetPartyBattlerData(battler); mon = GetBattlerMon(battler);
// Change species. // Change species.
if (cmd->case_ == 0) if (cmd->case_ == 0)
@ -11016,13 +11016,13 @@ static void Cmd_various(void)
if (IsBattlerAlive(battler)) if (IsBattlerAlive(battler))
{ {
SetBattlerShadowSpriteCallback(battler, gBattleMons[battler].species); SetBattlerShadowSpriteCallback(battler, gBattleMons[battler].species);
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
} }
i = BATTLE_PARTNER(battler); i = BATTLE_PARTNER(battler);
if (IsBattlerAlive(i)) if (IsBattlerAlive(i))
{ {
SetBattlerShadowSpriteCallback(i, gBattleMons[i].species); SetBattlerShadowSpriteCallback(i, gBattleMons[i].species);
BattleLoadMonSpriteGfx(GetPartyBattlerData(i), i); BattleLoadMonSpriteGfx(GetBattlerMon(i), i);
} }
} }
gBattlescriptCurrInstr = cmd->nextInstr; gBattlescriptCurrInstr = cmd->nextInstr;
@ -15810,8 +15810,8 @@ static void Cmd_handleballthrow(void)
case BALL_LOVE: case BALL_LOVE:
if (gBattleMons[gBattlerTarget].species == gBattleMons[gBattlerAttacker].species) if (gBattleMons[gBattlerTarget].species == gBattleMons[gBattlerAttacker].species)
{ {
u8 gender1 = GetMonGender(GetPartyBattlerData(gBattlerTarget)); u8 gender1 = GetMonGender(GetBattlerMon(gBattlerTarget));
u8 gender2 = GetMonGender(GetPartyBattlerData(gBattlerAttacker)); u8 gender2 = GetMonGender(GetBattlerMon(gBattlerAttacker));
if (gender1 != gender2 && gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS) if (gender1 != gender2 && gender1 != MON_GENDERLESS && gender2 != MON_GENDERLESS)
ballMultiplier = 800; ballMultiplier = 800;
@ -15893,7 +15893,7 @@ static void Cmd_handleballthrow(void)
MarkBattlerForControllerExec(gBattlerAttacker); MarkBattlerForControllerExec(gBattlerAttacker);
TryBattleFormChange(gBattlerTarget, FORM_CHANGE_END_BATTLE); TryBattleFormChange(gBattlerTarget, FORM_CHANGE_END_BATTLE);
gBattlescriptCurrInstr = BattleScript_SuccessBallThrow; gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_POKEBALL, &ballId); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_POKEBALL, &ballId);
if (CalculatePlayerPartyCount() == PARTY_SIZE) if (CalculatePlayerPartyCount() == PARTY_SIZE)
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@ -15902,15 +15902,15 @@ static void Cmd_handleballthrow(void)
if (ballId == BALL_HEAL) if (ballId == BALL_HEAL)
{ {
MonRestorePP(GetPartyBattlerData(gBattlerTarget)); MonRestorePP(GetBattlerMon(gBattlerTarget));
HealStatusConditions(GetPartyBattlerData(gBattlerTarget), STATUS1_ANY, gBattlerTarget); HealStatusConditions(GetBattlerMon(gBattlerTarget), STATUS1_ANY, gBattlerTarget);
gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP; gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP;
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_HP, &gBattleMons[gBattlerTarget].hp); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_HP, &gBattleMons[gBattlerTarget].hp);
} }
else if (ballId == BALL_FRIEND) else if (ballId == BALL_FRIEND)
{ {
u32 friendship = (B_FRIEND_BALL_MODIFIER >= GEN_8 ? 150 : 200); u32 friendship = (B_FRIEND_BALL_MODIFIER >= GEN_8 ? 150 : 200);
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_FRIENDSHIP, &friendship); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_FRIENDSHIP, &friendship);
} }
} }
else // mon may be caught, calculate shakes else // mon may be caught, calculate shakes
@ -15952,7 +15952,7 @@ static void Cmd_handleballthrow(void)
TryBattleFormChange(gBattlerTarget, FORM_CHANGE_END_BATTLE); TryBattleFormChange(gBattlerTarget, FORM_CHANGE_END_BATTLE);
gBattlescriptCurrInstr = BattleScript_SuccessBallThrow; gBattlescriptCurrInstr = BattleScript_SuccessBallThrow;
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_POKEBALL, &ballId); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_POKEBALL, &ballId);
if (CalculatePlayerPartyCount() == PARTY_SIZE) if (CalculatePlayerPartyCount() == PARTY_SIZE)
gBattleCommunication[MULTISTRING_CHOOSER] = 0; gBattleCommunication[MULTISTRING_CHOOSER] = 0;
@ -15961,15 +15961,15 @@ static void Cmd_handleballthrow(void)
if (ballId == BALL_HEAL) if (ballId == BALL_HEAL)
{ {
MonRestorePP(GetPartyBattlerData(gBattlerTarget)); MonRestorePP(GetBattlerMon(gBattlerTarget));
HealStatusConditions(GetPartyBattlerData(gBattlerTarget), STATUS1_ANY, gBattlerTarget); HealStatusConditions(GetBattlerMon(gBattlerTarget), STATUS1_ANY, gBattlerTarget);
gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP; gBattleMons[gBattlerTarget].hp = gBattleMons[gBattlerTarget].maxHP;
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_HP, &gBattleMons[gBattlerTarget].hp); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_HP, &gBattleMons[gBattlerTarget].hp);
} }
else if (ballId == BALL_FRIEND) else if (ballId == BALL_FRIEND)
{ {
u32 friendship = (B_FRIEND_BALL_MODIFIER >= GEN_8 ? 150 : 200); u32 friendship = (B_FRIEND_BALL_MODIFIER >= GEN_8 ? 150 : 200);
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_FRIENDSHIP, &friendship); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_FRIENDSHIP, &friendship);
} }
} }
else // not caught else // not caught
@ -16091,22 +16091,22 @@ static void Cmd_givecaughtmon(void)
{ {
u16 lostItem = gBattleStruct->itemLost[B_SIDE_OPPONENT][gBattlerPartyIndexes[GetCatchingBattler()]].originalItem; u16 lostItem = gBattleStruct->itemLost[B_SIDE_OPPONENT][gBattlerPartyIndexes[GetCatchingBattler()]].originalItem;
if (lostItem != ITEM_NONE && ItemId_GetPocket(lostItem) != POCKET_BERRIES) if (lostItem != ITEM_NONE && ItemId_GetPocket(lostItem) != POCKET_BERRIES)
SetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_HELD_ITEM, &lostItem); // Restore non-berry items SetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_HELD_ITEM, &lostItem); // Restore non-berry items
} }
if (GiveMonToPlayer(GetPartyBattlerData(GetCatchingBattler())) != MON_GIVEN_TO_PARTY if (GiveMonToPlayer(GetBattlerMon(GetCatchingBattler())) != MON_GIVEN_TO_PARTY
&& gBattleCommunication[MULTISTRING_CHOOSER] != B_MSG_SWAPPED_INTO_PARTY) && gBattleCommunication[MULTISTRING_CHOOSER] != B_MSG_SWAPPED_INTO_PARTY)
{ {
if (!ShouldShowBoxWasFullMessage()) if (!ShouldShowBoxWasFullMessage())
{ {
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SENT_SOMEONES_PC; gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SENT_SOMEONES_PC;
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON)));
GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_NICKNAME, gStringVar2); GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_NICKNAME, gStringVar2);
} }
else else
{ {
StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to StringCopy(gStringVar1, GetBoxNamePtr(VarGet(VAR_PC_BOX_TO_SEND_MON))); // box the mon was sent to
GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_NICKNAME, gStringVar2); GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_NICKNAME, gStringVar2);
StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to StringCopy(gStringVar3, GetBoxNamePtr(GetPCBoxToSendMon())); //box the mon was going to be sent to
gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SOMEONES_BOX_FULL; gBattleCommunication[MULTISTRING_CHOOSER] = B_MSG_SOMEONES_BOX_FULL;
} }
@ -16116,9 +16116,9 @@ static void Cmd_givecaughtmon(void)
gBattleCommunication[MULTISTRING_CHOOSER]++; gBattleCommunication[MULTISTRING_CHOOSER]++;
} }
gBattleResults.caughtMonSpecies = GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_SPECIES, NULL); gBattleResults.caughtMonSpecies = GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_SPECIES, NULL);
GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_NICKNAME, gBattleResults.caughtMonNick); GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_NICKNAME, gBattleResults.caughtMonNick);
gBattleResults.caughtMonBall = GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_POKEBALL, NULL); gBattleResults.caughtMonBall = GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_POKEBALL, NULL);
gSelectedMonPartyId = PARTY_SIZE; gSelectedMonPartyId = PARTY_SIZE;
gBattleCommunication[MULTIUSE_STATE] = 0; gBattleCommunication[MULTIUSE_STATE] = 0;
@ -16135,8 +16135,8 @@ static void Cmd_trysetcaughtmondexflags(void)
{ {
CMD_ARGS(const u8 *failInstr); CMD_ARGS(const u8 *failInstr);
u32 species = GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_SPECIES, NULL); u32 species = GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_SPECIES, NULL);
u32 personality = GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_PERSONALITY, NULL); u32 personality = GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_PERSONALITY, NULL);
if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT)) if (GetSetPokedexFlag(SpeciesToNationalPokedexNum(species), FLAG_GET_CAUGHT))
{ {
@ -16153,7 +16153,7 @@ static void Cmd_displaydexinfo(void)
{ {
CMD_ARGS(); CMD_ARGS();
u16 species = GetMonData(GetPartyBattlerData(GetCatchingBattler()), MON_DATA_SPECIES, NULL); u16 species = GetMonData(GetBattlerMon(GetCatchingBattler()), MON_DATA_SPECIES, NULL);
switch (gBattleCommunication[0]) switch (gBattleCommunication[0])
{ {
@ -16164,7 +16164,7 @@ static void Cmd_displaydexinfo(void)
case 1: case 1:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
struct Pokemon *mon = GetPartyBattlerData(GetCatchingBattler()); struct Pokemon *mon = GetBattlerMon(GetCatchingBattler());
FreeAllWindowBuffers(); FreeAllWindowBuffers();
gBattleCommunication[TASK_ID] = DisplayCaughtMonDexPage(species, gBattleCommunication[TASK_ID] = DisplayCaughtMonDexPage(species,
GetMonData(mon, MON_DATA_IS_SHINY), GetMonData(mon, MON_DATA_IS_SHINY),
@ -16320,14 +16320,14 @@ static void Cmd_trygivecaughtmonnick(void)
case 2: case 2:
if (!gPaletteFade.active) if (!gPaletteFade.active)
{ {
GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_NICKNAME, gBattleStruct->caughtMonNick); GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
FreeAllWindowBuffers(); FreeAllWindowBuffers();
MainCallback callback = CalculatePlayerPartyCount() == PARTY_SIZE ? ReshowBlankBattleScreenAfterMenu : BattleMainCB2; MainCallback callback = CalculatePlayerPartyCount() == PARTY_SIZE ? ReshowBlankBattleScreenAfterMenu : BattleMainCB2;
DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick, DoNamingScreen(NAMING_SCREEN_CAUGHT_MON, gBattleStruct->caughtMonNick,
GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_SPECIES), GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_SPECIES),
GetMonGender(GetPartyBattlerData(gBattlerTarget)), GetMonGender(GetBattlerMon(gBattlerTarget)),
GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_PERSONALITY, NULL), GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_PERSONALITY, NULL),
callback); callback);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
@ -16336,7 +16336,7 @@ static void Cmd_trygivecaughtmonnick(void)
case 3: case 3:
if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active) if (gMain.callback2 == BattleMainCB2 && !gPaletteFade.active)
{ {
SetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_NICKNAME, gBattleStruct->caughtMonNick); SetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_NICKNAME, gBattleStruct->caughtMonNick);
gBattleCommunication[MULTIUSE_STATE]++; gBattleCommunication[MULTIUSE_STATE]++;
} }
break; break;
@ -17726,23 +17726,23 @@ static void TryUpdateEvolutionTracker(u32 evolutionCondition, u32 upAmount, u16
if (evolutions[i].params[j].condition == evolutionCondition) if (evolutions[i].params[j].condition == evolutionCondition)
{ {
// We only have 10 bits to use // We only have 10 bits to use
u16 val = min(1023, GetMonData(GetPartyBattlerData(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER) + upAmount); u16 val = min(1023, GetMonData(GetBattlerMon(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER) + upAmount);
// Reset progress if you faint for the recoil method. // Reset progress if you faint for the recoil method.
switch (evolutionCondition) switch (evolutionCondition)
{ {
case IF_USED_MOVE_X_TIMES: case IF_USED_MOVE_X_TIMES:
if (evolutions[i].params[j].arg1 == usedMove) if (evolutions[i].params[j].arg1 == usedMove)
SetMonData(GetPartyBattlerData(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val); SetMonData(GetBattlerMon(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val);
break; break;
case IF_RECOIL_DAMAGE_GE: case IF_RECOIL_DAMAGE_GE:
if (gBattleMons[gBattlerAttacker].hp == 0) if (gBattleMons[gBattlerAttacker].hp == 0)
val = 0; val = 0;
SetMonData(GetPartyBattlerData(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val); SetMonData(GetBattlerMon(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val);
break; break;
case IF_DEFEAT_X_WITH_ITEMS: case IF_DEFEAT_X_WITH_ITEMS:
if (GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_SPECIES) == evolutions[i].params[j].arg1 if (GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_SPECIES) == evolutions[i].params[j].arg1
&& GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_HELD_ITEM) == evolutions[i].params[j].arg2) && GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_HELD_ITEM) == evolutions[i].params[j].arg2)
SetMonData(GetPartyBattlerData(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val); SetMonData(GetBattlerMon(gBattlerAttacker), MON_DATA_EVOLUTION_TRACKER, &val);
break; break;
} }
return; return;
@ -18678,7 +18678,7 @@ void BS_JumpIfCanGigantamax(void)
NATIVE_ARGS(u8 battler, const u8 *jumpInstr); NATIVE_ARGS(u8 battler, const u8 *jumpInstr);
u32 battler = GetBattlerForBattleScript(cmd->battler); u32 battler = GetBattlerForBattleScript(cmd->battler);
if (GetMonData(GetPartyBattlerData(battler), MON_DATA_GIGANTAMAX_FACTOR) if (GetMonData(GetBattlerMon(battler), MON_DATA_GIGANTAMAX_FACTOR)
&& GetGMaxTargetSpecies(gBattleMons[battler].species) != SPECIES_NONE) && GetGMaxTargetSpecies(gBattleMons[battler].species) != SPECIES_NONE)
gBattlescriptCurrInstr = cmd->jumpInstr; gBattlescriptCurrInstr = cmd->jumpInstr;
else else

2
src/battle_terastal.c
View File

@ -110,7 +110,7 @@ bool32 CanTerastallize(u32 battler)
// Returns a battler's Tera type. // Returns a battler's Tera type.
u32 GetBattlerTeraType(u32 battler) u32 GetBattlerTeraType(u32 battler)
{ {
return GetMonData(GetPartyBattlerData(battler), MON_DATA_TERA_TYPE); return GetMonData(GetBattlerMon(battler), MON_DATA_TERA_TYPE);
} }
// Uses up a type's Stellar boost. // Uses up a type's Stellar boost.

4
src/battle_tower.c
View File

@ -2655,8 +2655,8 @@ static void SetTowerInterviewData(void)
StripExtCtrlCodes(text); StripExtCtrlCodes(text);
StringCopy(gSaveBlock2Ptr->frontier.towerInterview.opponentName, text); StringCopy(gSaveBlock2Ptr->frontier.towerInterview.opponentName, text);
GetBattleTowerTrainerLanguage(&gSaveBlock2Ptr->frontier.towerInterview.opponentLanguage, TRAINER_BATTLE_PARAM.opponentA); GetBattleTowerTrainerLanguage(&gSaveBlock2Ptr->frontier.towerInterview.opponentLanguage, TRAINER_BATTLE_PARAM.opponentA);
gSaveBlock2Ptr->frontier.towerInterview.opponentSpecies = GetMonData(GetPartyBattlerData(1), MON_DATA_SPECIES, NULL); gSaveBlock2Ptr->frontier.towerInterview.opponentSpecies = GetMonData(GetBattlerMon(1), MON_DATA_SPECIES, NULL);
gSaveBlock2Ptr->frontier.towerInterview.playerSpecies = GetMonData(GetPartyBattlerData(0), MON_DATA_SPECIES, NULL); gSaveBlock2Ptr->frontier.towerInterview.playerSpecies = GetMonData(GetBattlerMon(0), MON_DATA_SPECIES, NULL);
for (i = 0; i < VANILLA_POKEMON_NAME_LENGTH + 1; i++) for (i = 0; i < VANILLA_POKEMON_NAME_LENGTH + 1; i++)
gSaveBlock2Ptr->frontier.towerInterview.opponentMonNickname[i] = gBattleMons[0].nickname[i]; gSaveBlock2Ptr->frontier.towerInterview.opponentMonNickname[i] = gBattleMons[0].nickname[i];
gSaveBlock2Ptr->frontier.towerBattleOutcome = gBattleOutcome; gSaveBlock2Ptr->frontier.towerBattleOutcome = gBattleOutcome;

10
src/battle_tv.c
View File

@ -338,8 +338,8 @@ void BattleTv_SetDataBasedOnString(enum StringID stringId)
defSide = GetBattlerSide(gBattlerTarget); defSide = GetBattlerSide(gBattlerTarget);
effSide = GetBattlerSide(gEffectBattler); effSide = GetBattlerSide(gEffectBattler);
scriptingSide = GetBattlerSide(gBattleMsgDataPtr->scrActive); scriptingSide = GetBattlerSide(gBattleMsgDataPtr->scrActive);
atkMon = GetPartyBattlerData(gBattlerAttacker); atkMon = GetBattlerMon(gBattlerAttacker);
defMon = GetPartyBattlerData(gBattlerTarget); defMon = GetBattlerMon(gBattlerTarget);
moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gBattleMsgDataPtr->currentMove); moveSlot = GetBattlerMoveSlotId(gBattlerAttacker, gBattleMsgDataPtr->currentMove);
if (moveSlot >= MAX_MON_MOVES && IsNotSpecialBattleString(stringId) && stringId > STRINGID_TABLE_START) if (moveSlot >= MAX_MON_MOVES && IsNotSpecialBattleString(stringId) && stringId > STRINGID_TABLE_START)
@ -1286,8 +1286,8 @@ static void TrySetBattleSeminarShow(void)
bestMoveId = i; bestMoveId = i;
} }
opponentSpecies = GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_SPECIES, NULL); opponentSpecies = GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_SPECIES, NULL);
playerSpecies = GetMonData(GetPartyBattlerData(gBattlerAttacker), MON_DATA_SPECIES, NULL); playerSpecies = GetMonData(GetBattlerMon(gBattlerAttacker), MON_DATA_SPECIES, NULL);
TryPutBattleSeminarOnAir(opponentSpecies, playerSpecies, gMoveSelectionCursor[gBattlerAttacker], gBattleMons[gBattlerAttacker].moves, gBattleMons[gBattlerAttacker].moves[bestMoveId]); TryPutBattleSeminarOnAir(opponentSpecies, playerSpecies, gMoveSelectionCursor[gBattlerAttacker], gBattleMons[gBattlerAttacker].moves, gBattleMons[gBattlerAttacker].moves[bestMoveId]);
break; break;
} }
@ -1363,7 +1363,7 @@ void BattleTv_ClearExplosionFaintCause(void)
u8 GetBattlerMoveSlotId(u8 battlerId, u16 moveId) u8 GetBattlerMoveSlotId(u8 battlerId, u16 moveId)
{ {
s32 i; s32 i;
struct Pokemon *mon = GetPartyBattlerData(battlerId); struct Pokemon *mon = GetBattlerMon(battlerId);
i = 0; i = 0;
while (1) while (1)

16
src/battle_util.c
View File

@ -1646,7 +1646,7 @@ u8 GetImprisonedMovesCount(u32 battler, u16 move)
u32 GetBattlerAffectionHearts(u32 battler) u32 GetBattlerAffectionHearts(u32 battler)
{ {
u8 side = GetBattlerSide(battler); u8 side = GetBattlerSide(battler);
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u16 species = GetMonData(mon, MON_DATA_SPECIES); u16 species = GetMonData(mon, MON_DATA_SPECIES);
if (side != B_SIDE_PLAYER) if (side != B_SIDE_PLAYER)
@ -4029,7 +4029,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
break; break;
case ABILITY_ZERO_TO_HERO: case ABILITY_ZERO_TO_HERO:
side = GetBattlerSide(battler); side = GetBattlerSide(battler);
mon = GetPartyBattlerData(battler); mon = GetBattlerMon(battler);
if (!gSpecialStatuses[battler].switchInAbilityDone if (!gSpecialStatuses[battler].switchInAbilityDone
&& GetMonData(mon, MON_DATA_SPECIES) == SPECIES_PALAFIN_HERO && GetMonData(mon, MON_DATA_SPECIES) == SPECIES_PALAFIN_HERO
@ -4116,7 +4116,7 @@ u32 AbilityBattleEffects(u32 caseID, u32 battler, u32 ability, u32 special, u32
&& IsBattlerAlive(battler) && IsBattlerAlive(battler)
&& gBattleStruct->commanderActive[partner] == SPECIES_NONE && gBattleStruct->commanderActive[partner] == SPECIES_NONE
&& gBattleMons[partner].species == SPECIES_DONDOZO && gBattleMons[partner].species == SPECIES_DONDOZO
&& GET_BASE_SPECIES_ID(GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES)) == SPECIES_TATSUGIRI) && GET_BASE_SPECIES_ID(GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES)) == SPECIES_TATSUGIRI)
{ {
SaveBattlerAttacker(gBattlerAttacker); SaveBattlerAttacker(gBattlerAttacker);
gSpecialStatuses[battler].switchInAbilityDone = TRUE; gSpecialStatuses[battler].switchInAbilityDone = TRUE;
@ -6119,7 +6119,7 @@ static enum ItemEffect TryEjectPack(u32 battler, enum ItemCaseId caseID)
static u32 ItemRestorePp(u32 battler, u32 itemId, enum ItemCaseId caseID) static u32 ItemRestorePp(u32 battler, u32 itemId, enum ItemCaseId caseID)
{ {
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u32 i, changedPP = 0; u32 i, changedPP = 0;
for (i = 0; i < MAX_MON_MOVES; i++) for (i = 0; i < MAX_MON_MOVES; i++)
@ -10116,7 +10116,7 @@ u16 GetBattleFormChangeTargetSpecies(u32 battler, enum FormChanges method)
u32 species = gBattleMons[battler].species; u32 species = gBattleMons[battler].species;
u32 targetSpecies = species; u32 targetSpecies = species;
const struct FormChange *formChanges = GetSpeciesFormChanges(species); const struct FormChange *formChanges = GetSpeciesFormChanges(species);
struct Pokemon *mon = GetPartyBattlerData(battler); struct Pokemon *mon = GetBattlerMon(battler);
u16 heldItem = gBattleMons[battler].item; u16 heldItem = gBattleMons[battler].item;
for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++) for (i = 0; formChanges != NULL && formChanges[i].method != FORM_CHANGE_TERMINATOR; i++)
@ -10341,9 +10341,9 @@ struct Pokemon *GetIllusionMonPtr(u32 battler)
if (!gBattleStruct->illusion[battler].set) if (!gBattleStruct->illusion[battler].set)
{ {
if (GetBattlerSide(battler) == B_SIDE_PLAYER) if (GetBattlerSide(battler) == B_SIDE_PLAYER)
SetIllusionMon(GetPartyBattlerData(battler), battler); SetIllusionMon(GetBattlerMon(battler), battler);
else else
SetIllusionMon(GetPartyBattlerData(battler), battler); SetIllusionMon(GetBattlerMon(battler), battler);
} }
if (!gBattleStruct->illusion[battler].on) if (!gBattleStruct->illusion[battler].on)
return NULL; return NULL;
@ -10469,7 +10469,7 @@ void SetDynamicMoveCategory(u32 battlerAtk, u32 battlerDef, u32 move)
gBattleStruct->swapDamageCategory = GetCategoryBasedOnStats(battlerAtk) == DAMAGE_CATEGORY_PHYSICAL; gBattleStruct->swapDamageCategory = GetCategoryBasedOnStats(battlerAtk) == DAMAGE_CATEGORY_PHYSICAL;
break; break;
case EFFECT_TERA_STARSTORM: case EFFECT_TERA_STARSTORM:
if (GetActiveGimmick(battlerAtk) == GIMMICK_TERA && GET_BASE_SPECIES_ID(GetMonData(GetPartyBattlerData(battlerAtk), MON_DATA_SPECIES)) == SPECIES_TERAPAGOS) if (GetActiveGimmick(battlerAtk) == GIMMICK_TERA && GET_BASE_SPECIES_ID(GetMonData(GetBattlerMon(battlerAtk), MON_DATA_SPECIES)) == SPECIES_TERAPAGOS)
gBattleStruct->swapDamageCategory = GetCategoryBasedOnStats(battlerAtk) == DAMAGE_CATEGORY_PHYSICAL; gBattleStruct->swapDamageCategory = GetCategoryBasedOnStats(battlerAtk) == DAMAGE_CATEGORY_PHYSICAL;
break; break;
default: default:

6
src/battle_util2.c
View File

@ -98,13 +98,13 @@ void AdjustFriendshipOnBattleFaint(u8 battler)
if (gBattleMons[opposingBattlerId].level > gBattleMons[battler].level) if (gBattleMons[opposingBattlerId].level > gBattleMons[battler].level)
{ {
if (gBattleMons[opposingBattlerId].level - gBattleMons[battler].level > 29) if (gBattleMons[opposingBattlerId].level - gBattleMons[battler].level > 29)
AdjustFriendship(GetPartyBattlerData(battler), FRIENDSHIP_EVENT_FAINT_LARGE); AdjustFriendship(GetBattlerMon(battler), FRIENDSHIP_EVENT_FAINT_LARGE);
else else
AdjustFriendship(GetPartyBattlerData(battler), FRIENDSHIP_EVENT_FAINT_SMALL); AdjustFriendship(GetBattlerMon(battler), FRIENDSHIP_EVENT_FAINT_SMALL);
} }
else else
{ {
AdjustFriendship(GetPartyBattlerData(battler), FRIENDSHIP_EVENT_FAINT_SMALL); AdjustFriendship(GetBattlerMon(battler), FRIENDSHIP_EVENT_FAINT_SMALL);
} }
} }

4
src/pokeball.c
View File

@ -993,7 +993,7 @@ static void SpriteCB_ReleaseMonFromBall(struct Sprite *sprite)
u16 wantedCryCase; u16 wantedCryCase;
u8 taskId; u8 taskId;
mon = GetPartyBattlerData(battlerId); mon = GetBattlerMon(battlerId);
if (GetBattlerSide(battlerId) != B_SIDE_PLAYER) if (GetBattlerSide(battlerId) != B_SIDE_PLAYER)
pan = 25; pan = 25;
else else
@ -1581,7 +1581,7 @@ void FreeBallGfx(u8 ballId)
static u16 GetBattlerPokeballItemId(u8 battlerId) static u16 GetBattlerPokeballItemId(u8 battlerId)
{ {
struct Pokemon *illusionMon; struct Pokemon *illusionMon;
struct Pokemon *mon = GetPartyBattlerData(battlerId); struct Pokemon *mon = GetBattlerMon(battlerId);
illusionMon = GetIllusionMonPtr(battlerId); illusionMon = GetIllusionMonPtr(battlerId);
if (illusionMon != NULL) if (illusionMon != NULL)

2
src/pokemon_animation.c
View File

@ -551,7 +551,7 @@ void LaunchAnimationTaskForBackSprite(struct Sprite *sprite, u8 backAnimSet)
gTasks[taskId].tPtrLo = (u32)(sprite); gTasks[taskId].tPtrLo = (u32)(sprite);
battlerId = sprite->data[0]; battlerId = sprite->data[0];
nature = GetNature(GetPartyBattlerData(battlerId)); nature = GetNature(GetBattlerMon(battlerId));
// * 3 below because each back anim has 3 variants depending on nature // * 3 below because each back anim has 3 variants depending on nature
animId = 3 * backAnimSet + gNaturesInfo[nature].backAnim; animId = 3 * backAnimSet + gNaturesInfo[nature].backAnim;

12
src/recorded_battle.c
View File

@ -759,24 +759,24 @@ void RecordedBattle_CheckMovesetChanges(u8 mode)
if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED)) if (!(gBattleMons[battlerId].status2 & STATUS2_TRANSFORMED))
{ {
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
ppBonuses[j] = (GetMonData(GetPartyBattlerData(battlerId), MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1); ppBonuses[j] = (GetMonData(GetBattlerMon(battlerId), MON_DATA_PP_BONUSES, NULL) & ((3 << (j << 1)))) >> (j << 1);
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
movePp.moves[j] = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_MOVE1 + moveSlots[j], NULL); movePp.moves[j] = GetMonData(GetBattlerMon(battlerId), MON_DATA_MOVE1 + moveSlots[j], NULL);
movePp.currentPp[j] = GetMonData(GetPartyBattlerData(battlerId), MON_DATA_PP1 + moveSlots[j], NULL); movePp.currentPp[j] = GetMonData(GetBattlerMon(battlerId), MON_DATA_PP1 + moveSlots[j], NULL);
movePp.maxPp[j] = ppBonuses[moveSlots[j]]; movePp.maxPp[j] = ppBonuses[moveSlots[j]];
} }
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
{ {
SetMonData(GetPartyBattlerData(battlerId), MON_DATA_MOVE1 + j, &movePp.moves[j]); SetMonData(GetBattlerMon(battlerId), MON_DATA_MOVE1 + j, &movePp.moves[j]);
SetMonData(GetPartyBattlerData(battlerId), MON_DATA_PP1 + j, &movePp.currentPp[j]); SetMonData(GetBattlerMon(battlerId), MON_DATA_PP1 + j, &movePp.currentPp[j]);
} }
ppBonusSet = 0; ppBonusSet = 0;
for (j = 0; j < MAX_MON_MOVES; j++) for (j = 0; j < MAX_MON_MOVES; j++)
ppBonusSet |= movePp.maxPp[j] << (j << 1); ppBonusSet |= movePp.maxPp[j] << (j << 1);
SetMonData(GetPartyBattlerData(battlerId), MON_DATA_PP_BONUSES, &ppBonusSet); SetMonData(GetBattlerMon(battlerId), MON_DATA_PP_BONUSES, &ppBonusSet);
} }
gChosenMoveByBattler[battlerId] = gBattleMons[battlerId].moves[gBattleStruct->chosenMovePositions[battlerId]]; gChosenMoveByBattler[battlerId] = gBattleMons[battlerId].moves[gBattleStruct->chosenMovePositions[battlerId]];
} }

34
src/reshow_battle_screen.c
View File

@ -138,13 +138,13 @@ static void CB2_ReshowBattleScreenAfterMenu(void)
LoadAndCreateEnemyShadowSprites(); LoadAndCreateEnemyShadowSprites();
opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT); opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
species = GetMonData(GetPartyBattlerData(opponentBattler), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(opponentBattler), MON_DATA_SPECIES);
SetBattlerShadowSpriteCallback(opponentBattler, species); SetBattlerShadowSpriteCallback(opponentBattler, species);
if (IsDoubleBattle()) if (IsDoubleBattle())
{ {
opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT); opponentBattler = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
species = GetMonData(GetPartyBattlerData(opponentBattler), MON_DATA_SPECIES); species = GetMonData(GetBattlerMon(opponentBattler), MON_DATA_SPECIES);
SetBattlerShadowSpriteCallback(opponentBattler, species); SetBattlerShadowSpriteCallback(opponentBattler, species);
} }
@ -271,7 +271,7 @@ static bool8 LoadBattlerSpriteGfx(u32 battler)
if (GetBattlerSide(battler) != B_SIDE_PLAYER) if (GetBattlerSide(battler) != B_SIDE_PLAYER)
{ {
if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute)
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
else else
BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE); BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE);
} }
@ -280,7 +280,7 @@ static bool8 LoadBattlerSpriteGfx(u32 battler)
else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler. else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && battler == B_POSITION_PLAYER_LEFT) // Should be checking position, not battler.
DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, battler); DecompressTrainerBackPic(TRAINER_BACK_PIC_WALLY, battler);
else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute) else if (!gBattleSpritesDataPtr->battlerData[battler].behindSubstitute)
BattleLoadMonSpriteGfx(GetPartyBattlerData(battler), battler); BattleLoadMonSpriteGfx(GetBattlerMon(battler), battler);
else else
BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE); BattleLoadSubstituteOrMonSpriteGfx(battler, FALSE);
@ -302,17 +302,17 @@ void CreateBattlerSprite(u32 battler)
if (GetBattlerSide(battler) != B_SIDE_PLAYER) if (GetBattlerSide(battler) != B_SIDE_PLAYER)
{ {
if (GetMonData(GetPartyBattlerData(battler), MON_DATA_HP) == 0) if (GetMonData(GetBattlerMon(battler), MON_DATA_HP) == 0)
return; return;
if (gBattleScripting.monCaught) // Don't create opponent sprite if it has been caught. if (gBattleScripting.monCaught) // Don't create opponent sprite if it has been caught.
return; return;
SetMultiuseSpriteTemplateToPokemon(GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES), GetBattlerPosition(battler)); SetMultiuseSpriteTemplateToPokemon(GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES), GetBattlerPosition(battler));
gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2), posY, GetBattlerSpriteSubpriority(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2), posY, GetBattlerSpriteSubpriority(battler));
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
gSprites[gBattlerSpriteIds[battler]].data[0] = battler; gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES); gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
} }
@ -338,15 +338,15 @@ void CreateBattlerSprite(u32 battler)
} }
else else
{ {
if (!IsValidForBattle(GetPartyBattlerData(battler))) if (!IsValidForBattle(GetBattlerMon(battler)))
return; return;
SetMultiuseSpriteTemplateToPokemon(GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES), GetBattlerPosition(battler)); SetMultiuseSpriteTemplateToPokemon(GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES), GetBattlerPosition(battler));
gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2), posY, GetBattlerSpriteSubpriority(battler)); gBattlerSpriteIds[battler] = CreateSprite(&gMultiuseSpriteTemplate, GetBattlerSpriteCoord(battler, BATTLER_COORD_X_2), posY, GetBattlerSpriteSubpriority(battler));
gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler; gSprites[gBattlerSpriteIds[battler]].oam.paletteNum = battler;
gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[battler]].callback = SpriteCallbackDummy;
gSprites[gBattlerSpriteIds[battler]].data[0] = battler; gSprites[gBattlerSpriteIds[battler]].data[0] = battler;
gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(GetPartyBattlerData(battler), MON_DATA_SPECIES); gSprites[gBattlerSpriteIds[battler]].data[2] = GetMonData(GetBattlerMon(battler), MON_DATA_SPECIES);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[battler]], 0);
} }
@ -373,11 +373,11 @@ static void CreateHealthboxSprite(u32 battler)
SetHealthboxSpriteVisible(healthboxSpriteId); SetHealthboxSpriteVisible(healthboxSpriteId);
if (GetBattlerSide(battler) != B_SIDE_PLAYER) if (GetBattlerSide(battler) != B_SIDE_PLAYER)
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_SAFARI_ALL_TEXT); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_SAFARI_ALL_TEXT);
else else
UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetPartyBattlerData(battler), HEALTHBOX_ALL); UpdateHealthboxAttribute(gHealthboxSpriteIds[battler], GetBattlerMon(battler), HEALTHBOX_ALL);
if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT) if (GetBattlerPosition(battler) == B_POSITION_OPPONENT_RIGHT || GetBattlerPosition(battler) == B_POSITION_PLAYER_RIGHT)
DummyBattleInterfaceFunc(gHealthboxSpriteIds[battler], TRUE); DummyBattleInterfaceFunc(gHealthboxSpriteIds[battler], TRUE);
@ -386,12 +386,12 @@ static void CreateHealthboxSprite(u32 battler)
if (GetBattlerSide(battler) != B_SIDE_PLAYER) if (GetBattlerSide(battler) != B_SIDE_PLAYER)
{ {
if (GetMonData(GetPartyBattlerData(battler), MON_DATA_HP) == 0) if (GetMonData(GetBattlerMon(battler), MON_DATA_HP) == 0)
SetHealthboxSpriteInvisible(healthboxSpriteId); SetHealthboxSpriteInvisible(healthboxSpriteId);
} }
else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI)) else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
{ {
if (!IsValidForBattle(GetPartyBattlerData(battler))) if (!IsValidForBattle(GetBattlerMon(battler)))
SetHealthboxSpriteInvisible(healthboxSpriteId); SetHealthboxSpriteInvisible(healthboxSpriteId);
} }
} }
@ -399,12 +399,12 @@ static void CreateHealthboxSprite(u32 battler)
static void CreateCaughtMonSprite(void) static void CreateCaughtMonSprite(void)
{ {
SetMultiuseSpriteTemplateToPokemon(GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_SPECIES), GetBattlerPosition(gBattlerTarget)); SetMultiuseSpriteTemplateToPokemon(GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_SPECIES), GetBattlerPosition(gBattlerTarget));
gBattlerSpriteIds[gBattlerTarget] = CreateSprite(&gMultiuseSpriteTemplate, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, GetBattlerSpriteSubpriority(gBattlerTarget)); gBattlerSpriteIds[gBattlerTarget] = CreateSprite(&gMultiuseSpriteTemplate, DISPLAY_WIDTH / 2, DISPLAY_HEIGHT / 2, GetBattlerSpriteSubpriority(gBattlerTarget));
gSprites[gBattlerSpriteIds[gBattlerTarget]].oam.paletteNum = gBattlerTarget; gSprites[gBattlerSpriteIds[gBattlerTarget]].oam.paletteNum = gBattlerTarget;
gSprites[gBattlerSpriteIds[gBattlerTarget]].callback = SpriteCallbackDummy; gSprites[gBattlerSpriteIds[gBattlerTarget]].callback = SpriteCallbackDummy;
gSprites[gBattlerSpriteIds[gBattlerTarget]].data[0] = gBattlerTarget; gSprites[gBattlerSpriteIds[gBattlerTarget]].data[0] = gBattlerTarget;
gSprites[gBattlerSpriteIds[gBattlerTarget]].data[2] = GetMonData(GetPartyBattlerData(gBattlerTarget), MON_DATA_SPECIES); gSprites[gBattlerSpriteIds[gBattlerTarget]].data[2] = GetMonData(GetBattlerMon(gBattlerTarget), MON_DATA_SPECIES);
StartSpriteAnim(&gSprites[gBattlerSpriteIds[gBattlerTarget]], 0); StartSpriteAnim(&gSprites[gBattlerSpriteIds[gBattlerTarget]], 0);

4
src/type_icons.c
View File

@ -240,7 +240,7 @@ void LoadTypeIcons(u32 battler)
{ {
u32 position; u32 position;
struct Pokemon* mon = GetPartyBattlerData(battler); struct Pokemon* mon = GetBattlerMon(battler);
u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL); u32 species = GetMonData(mon, MON_DATA_SPECIES, NULL);
if (B_SHOW_TYPES == SHOW_TYPES_NEVER if (B_SHOW_TYPES == SHOW_TYPES_NEVER
@ -296,7 +296,7 @@ static bool32 UseDoubleBattleCoords(u32 position)
static u32 GetMonPublicType(u32 battlerId, u32 typeNum) static u32 GetMonPublicType(u32 battlerId, u32 typeNum)
{ {
struct Pokemon* mon = GetPartyBattlerData(battlerId); struct Pokemon* mon = GetBattlerMon(battlerId);
u32 monSpecies = GetMonData(mon,MON_DATA_SPECIES,NULL); u32 monSpecies = GetMonData(mon,MON_DATA_SPECIES,NULL);
struct Pokemon* monIllusion; struct Pokemon* monIllusion;
u32 illusionSpecies; u32 illusionSpecies;