summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_anim.c2
-rw-r--r--src/battle_anim_effects_3.c20
-rw-r--r--src/rom_8077ABC.c74
3 files changed, 48 insertions, 48 deletions
diff --git a/src/battle_anim.c b/src/battle_anim.c
index 2d28aeaa5..788dc210b 100644
--- a/src/battle_anim.c
+++ b/src/battle_anim.c
@@ -1912,7 +1912,7 @@ bool8 IsAnimBankSpriteVisible(u8 bank)
return FALSE;
if (IsContest())
return TRUE; // this line wont ever be reached.
- if (!(EWRAM_17800[bank].unk0 & 1) || !gSprites[gBattlerSpriteIds[bank]].invisible)
+ if (!gBattleSpriteInfo[bank].invisible || !gSprites[gBattlerSpriteIds[bank]].invisible)
return TRUE;
return FALSE;
diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c
index ab2e7aeca..a8a5b1a35 100644
--- a/src/battle_anim_effects_3.c
+++ b/src/battle_anim_effects_3.c
@@ -2362,7 +2362,7 @@ void sub_812D7E8(u8 taskId)
if (GetBattlerSide(gBattleAnimAttacker) == B_SIDE_OPPONENT)
{
if (gTasks[taskId].data[10] == 0)
- sub_8032984(gBattleAnimAttacker, eTransformStatuses[gBattleAnimAttacker].species);
+ sub_8032984(gBattleAnimAttacker, gBattleSpriteInfo[gBattleAnimAttacker].transformedSpecies);
}
}
@@ -3202,7 +3202,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
isBackPic = 0;
personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
- if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
+ if (gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies == SPECIES_NONE)
{
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
@@ -3211,7 +3211,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
}
else
{
- species = eTransformStatuses[gBattleAnimTarget].species;
+ species = gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies;
}
xOffset = 20;
@@ -3222,7 +3222,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
isBackPic = 1;
personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_PERSONALITY);
otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_OT_ID);
- if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
+ if (gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies == SPECIES_NONE)
{
if (GetBattlerSide(gBattleAnimTarget) == B_SIDE_PLAYER)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimTarget]], MON_DATA_SPECIES);
@@ -3231,7 +3231,7 @@ void AnimTask_RolePlaySilhouette(u8 taskId)
}
else
{
- species = eTransformStatuses[gBattleAnimTarget].species;
+ species = gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies;
}
xOffset = -20;
@@ -4964,10 +4964,10 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
{
personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY);
otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID);
- if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
+ if (gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies == SPECIES_NONE)
species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
else
- species = eTransformStatuses[gBattleAnimTarget].species;
+ species = gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies;
subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET)].subpriority + 1;
isBackPic = 0;
@@ -4977,10 +4977,10 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
{
personality = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY);
otId = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID);
- if (eTransformStatuses[gBattleAnimTarget].species == SPECIES_NONE)
+ if (gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies == SPECIES_NONE)
species = GetMonData(&gEnemyParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES);
else
- species = eTransformStatuses[gBattleAnimTarget].species;
+ species = gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies;
subpriority = gSprites[GetAnimBattlerSpriteId(ANIM_BATTLER_TARGET)].subpriority - 1;
isBackPic = 1;
@@ -4989,7 +4989,7 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId)
}
spriteId2 = sub_8079F44(species, isBackPic, 0, x, GetBattlerSpriteCoord(gBattleAnimTarget, BATTLER_COORD_Y), subpriority, personality, otId);
- if (eTransformStatuses[gBattleAnimTarget].species != SPECIES_NONE)
+ if (gBattleSpriteInfo[gBattleAnimTarget].transformedSpecies != SPECIES_NONE)
BlendPalette((gSprites[spriteId2].oam.paletteNum * 16) | 0x100, 16, 6, RGB_WHITE);
gTasks[taskId].data[15] = spriteId2;
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 9b3e818ac..2074a88be 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -151,7 +151,7 @@ u8 GetBattlerSpriteCoord(u8 slot, u8 a2)
{
u8 var;
u16 species;
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
if (IsContest())
{
@@ -181,19 +181,19 @@ u8 GetBattlerSpriteCoord(u8 slot, u8 a2)
{
if (GetBattlerSide(slot))
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
else
- species = transform->species;
+ species = transform->transformedSpecies;
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
else
- species = transform->species;
+ species = transform->transformedSpecies;
}
}
if (a2 == 3)
@@ -209,7 +209,7 @@ u8 sub_8077BFC(u8 slot, u16 species)
{
u16 letter;
u32 personality;
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
u8 ret;
u16 var;
@@ -226,8 +226,8 @@ u8 sub_8077BFC(u8 slot, u16 species)
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
else
personality = gTransformPersonalities[slot];
@@ -256,8 +256,8 @@ u8 sub_8077BFC(u8 slot, u16 species)
{
if (species == SPECIES_UNOWN)
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
else
personality = gTransformPersonalities[slot];
@@ -330,7 +330,7 @@ u8 GetBattlerSpriteFinal_Y(u8 slot, u16 species, u8 a3)
u8 sub_8077EE4(u8 slot, u8 a2)
{
u16 species;
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
if (a2 == 3 || a2 == 4)
{
if (IsContest())
@@ -342,11 +342,11 @@ u8 sub_8077EE4(u8 slot, u8 a2)
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
species = gAnimSpeciesByBanks[slot];
else
- species = transform->species;
+ species = transform->transformedSpecies;
}
if (a2 == 3)
return GetBattlerSpriteFinal_Y(slot, species, 1);
@@ -378,27 +378,27 @@ u8 sub_8077FC0(u8 slot)
{
u16 var;
u8 r6;
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
r6 = GetBattlerSpriteCoord(slot, 1);
if (!IsContest())
{
if (GetBattlerSide(slot) != 0)
{
- transform = &eTransformStatuses[slot];
- if (!transform->species) {
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies) {
var = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
} else {
- var = transform->species;
+ var = transform->transformedSpecies;
}
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
var = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
else
- var = transform->species;
+ var = transform->transformedSpecies;
}
if (GetBattlerSide(slot) != 0)
r6 -= sub_8077DD8(slot, var);
@@ -1745,7 +1745,7 @@ void sub_8079AB8(u8 sprite, u8 sprite2)
u16 sub_8079B10(u8 sprite)
{
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
u8 slot = gSprites[sprite].data[0];
u16 species;
u16 i;
@@ -1763,20 +1763,20 @@ u16 sub_8079B10(u8 sprite)
{
if (!GetBattlerSide(i))
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES);
else
- species = transform->species;
+ species = transform->transformedSpecies;
return gMonBackPicCoords[species].y_offset;
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[i]], MON_DATA_SPECIES);
else
- species = transform->species;
+ species = transform->transformedSpecies;
return gMonFrontPicCoords[species].y_offset;
}
}
@@ -1993,7 +1993,7 @@ s16 GetBattlerSpriteCoordAttr(u8 slot, u8 a2)
u16 var;
int ret;
const struct MonCoords *coords;
- struct TransformStatus *transform;
+ struct BattleSpriteInfo *transform;
if (IsContest())
{
@@ -2033,15 +2033,15 @@ s16 GetBattlerSpriteCoordAttr(u8 slot, u8 a2)
{
if (!GetBattlerSide(slot))
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
{
species = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
personality = GetMonData(&gPlayerParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
}
else
{
- species = transform->species;
+ species = transform->transformedSpecies;
personality = gTransformPersonalities[slot];
}
if (species == SPECIES_UNOWN)
@@ -2064,15 +2064,15 @@ s16 GetBattlerSpriteCoordAttr(u8 slot, u8 a2)
}
else
{
- transform = &eTransformStatuses[slot];
- if (!transform->species)
+ transform = &gBattleSpriteInfo[slot];
+ if (!transform->transformedSpecies)
{
species = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_SPECIES);
personality = GetMonData(&gEnemyParty[gBattleMonPartyPositions[slot]], MON_DATA_PERSONALITY);
}
else
{
- species = transform->species;
+ species = transform->transformedSpecies;
personality = gTransformPersonalities[slot];
}
if (species == SPECIES_UNOWN)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 14:06:51 +0000