dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Document contest appeal

Browse Source
This commit is contained in:
GriffinR
2020-08-13 19:10:23 -04:00
parent 3779422489
commit c42c1ab8c1
13 changed files with 1203 additions and 1017 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_anim_mons.c
+15 -15
View File
@@ -141,10 +141,10 @@ u8 GetBattlerSpriteCoord(u8 battlerId, u8 coordType)
default:
if (IsContest())
{
if (gContestResources->field_18->unk4_0)
species = gContestResources->field_18->unk2;
if (gContestResources->moveAnim->hasTargetAnim)
species = gContestResources->moveAnim->targetSpecies;
else
species = gContestResources->field_18->species;
species = gContestResources->moveAnim->species;
}
else
{
@@ -189,10 +189,10 @@ u8 GetBattlerYDelta(u8 battlerId, u16 species)
{
if (IsContest())
{
if (gContestResources->field_18->unk4_0)
personality = gContestResources->field_18->unk10;
if (gContestResources->moveAnim->hasTargetAnim)
personality = gContestResources->moveAnim->targetPersonality;
else
personality = gContestResources->field_18->unk8;
personality = gContestResources->moveAnim->personality;
}
else
{
@@ -306,10 +306,10 @@ u8 GetBattlerSpriteCoord2(u8 battlerId, u8 coordType)
{
if (IsContest())
{
if (gContestResources->field_18->unk4_0)
species = gContestResources->field_18->unk2;
if (gContestResources->moveAnim->hasTargetAnim)
species = gContestResources->moveAnim->targetSpecies;
else
species = gContestResources->field_18->species;
species = gContestResources->moveAnim->species;
}
else
{
@@ -1851,7 +1851,7 @@ static u16 GetBattlerYDeltaFromSpriteId(u8 spriteId)
{
if (IsContest())
{
species = gContestResources->field_18->species;
species = gContestResources->moveAnim->species;
return gMonBackPicCoords[species].y_offset;
}
else
@@ -2103,15 +2103,15 @@ s16 GetBattlerSpriteCoordAttr(u8 battlerId, u8 attr)
if (IsContest())
{
if (gContestResources->field_18->unk4_0)
if (gContestResources->moveAnim->hasTargetAnim)
{
species = gContestResources->field_18->unk2;
personality = gContestResources->field_18->unk10;
species = gContestResources->moveAnim->targetSpecies;
personality = gContestResources->moveAnim->targetPersonality;
}
else
{
species = gContestResources->field_18->species;
personality = gContestResources->field_18->unk8;
species = gContestResources->moveAnim->species;
personality = gContestResources->moveAnim->personality;
}
if (species == SPECIES_UNOWN)
{