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

Revert incorrect constant usage, add new correct ones

Browse Source
This commit is contained in:
GriffinR
2023-01-18 12:11:09 -05:00
parent 5a906c33ac
commit b7d92e8537
4 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/battle_anim_dark.c
View File

@@ -943,19 +943,19 @@ void AnimTask_SetGrayscaleOrOriginalPal(u8 taskId)
case ANIM_DEF_PARTNER:
spriteId = GetAnimBattlerSpriteId(gBattleAnimArgs[0]);
break;
case 4:
case ANIM_PLAYER_LEFT:
position = B_POSITION_PLAYER_LEFT;
calcSpriteId = TRUE;
break;
case 5:
case ANIM_PLAYER_RIGHT:
position = B_POSITION_PLAYER_RIGHT;
calcSpriteId = TRUE;
break;
case 6:
case ANIM_OPPONENT_LEFT:
position = B_POSITION_OPPONENT_LEFT;
calcSpriteId = TRUE;
break;
case 7:
case ANIM_OPPONENT_RIGHT:
position = B_POSITION_OPPONENT_RIGHT;
calcSpriteId = TRUE;
break;

10
src/battle_anim_mon_movement.c
View File

@@ -164,20 +164,20 @@ void AnimTask_ShakeMon2(u8 taskId)
if (spriteId == SPRITE_NONE)
abort = TRUE;
}
else if (gBattleAnimArgs[0] != 8)
else if (gBattleAnimArgs[0] != ANIM_ATTACKER_FORCE)
{
switch (gBattleAnimArgs[0])
{
case 4:
case ANIM_PLAYER_LEFT:
battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_LEFT);
break;
case 5:
case ANIM_PLAYER_RIGHT:
battlerId = GetBattlerAtPosition(B_POSITION_PLAYER_RIGHT);
break;
case 6:
case ANIM_OPPONENT_LEFT:
battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_LEFT);
break;
case 7:
case ANIM_OPPONENT_RIGHT:
default:
battlerId = GetBattlerAtPosition(B_POSITION_OPPONENT_RIGHT);
break;