atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix atk49state

Browse source
This commit is contained in:
DizzyEggg 2019-12-09 08:41:09 +01:00
parent 740ab29c7c
commit 9b459eb64a
2 changed files with 3 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/battle_interface.c
View file

@ -499,27 +499,6 @@ static const struct SpriteSheet sStatusSummaryBallsSpriteSheet =
gBattleInterface_BallDisplayGfx, 0x80, TAG_STATUS_SUMMARY_BALLS_TILE gBattleInterface_BallDisplayGfx, 0x80, TAG_STATUS_SUMMARY_BALLS_TILE
}; };
<<<<<<< HEAD
=======
// unused oam data
static const struct OamData sUnknown_0832C354 =
{
.y = 0,
.affineMode = ST_OAM_AFFINE_OFF,
.objMode = ST_OAM_OBJ_NORMAL,
.mosaic = 0,
.bpp = ST_OAM_4BPP,
.shape = SPRITE_SHAPE(64x32),
.x = 0,
.matrixNum = 0,
.size = SPRITE_SIZE(64x32),
.tileNum = 0,
.priority = 1,
.paletteNum = 0,
.affineParam = 0,
};
>>>>>>> 47ea65b96e4575a335d3197483841041cb361541
static const struct OamData sOamData_StatusSummaryBalls = static const struct OamData sOamData_StatusSummaryBalls =
{ {
.y = 0, .y = 0,

6
src/battle_script_commands.c
View file

@ -4673,7 +4673,7 @@ static void Cmd_moveend(void)
if (gBattleMoves[gCurrentMove].flags & FLAG_DANCE) if (gBattleMoves[gCurrentMove].flags & FLAG_DANCE)
{ {
u8 battler, nextDancer = 0; u8 battler, nextDancer = 0;
if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker] if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker]
|| (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove
&& gProtectStructs[gBattlerAttacker].usesBouncedMove))) && gProtectStructs[gBattlerAttacker].usesBouncedMove)))
@ -4690,14 +4690,14 @@ static void Cmd_moveend(void)
if (GetBattlerAbility(battler) == ABILITY_DANCER && !gSpecialStatuses[battler].dancerUsedMove) if (GetBattlerAbility(battler) == ABILITY_DANCER && !gSpecialStatuses[battler].dancerUsedMove)
{ {
if (!nextDancer || (gBattleMons[battler].speed < gBattleMons[nextDancer & 0x3].speed)) if (!nextDancer || (gBattleMons[battler].speed < gBattleMons[nextDancer & 0x3].speed))
nextDancer = battler | 0x4; nextDancer = battler | 0x4;
} }
} }
if (nextDancer && AbilityBattleEffects(ABILITYEFFECT_MOVE_END_OTHER, nextDancer & 0x3, 0, 0, 0)) if (nextDancer && AbilityBattleEffects(ABILITYEFFECT_MOVE_END_OTHER, nextDancer & 0x3, 0, 0, 0))
effect = TRUE; effect = TRUE;
} }
} }
gBattleScripting.atk49_state++; gBattleScripting.moveendState++;
break; break;
case MOVEEND_CLEAR_BITS: // Clear bits active while using a move for all targets and all hits. case MOVEEND_CLEAR_BITS: // Clear bits active while using a move for all targets and all hits.
if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget) if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget)