diff options
| author | Evan <eroelke@gmail.com> | 2019-12-04 18:58:55 -0700 |
|---|---|---|
| committer | Evan <eroelke@gmail.com> | 2019-12-04 18:58:55 -0700 |
| commit | bc36d1cb2a862d447a52d69cadcc18b769cf7141 (patch) | |
| tree | 1ed66028deaeba38bd7845227001b749a80c2d1d | |
| parent | 6581fdb69ddb2be974aa2278381c334b71a4a5ff (diff) | |
| parent | aa272d1e512c38bb271d8d6f1f7491920f28c5eb (diff) | |
fix merge conflicts
| -rw-r--r-- | include/sprite.h | 2 | ||||
| -rw-r--r-- | src/battle_anim_effects_3.c | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/sprite.h b/include/sprite.h index e09daa08a..7432306a4 100644 --- a/include/sprite.h +++ b/include/sprite.h @@ -210,7 +210,7 @@ struct Sprite /*0x2D*/ u8 animLoopCounter; // general purpose data fields - /*0x2E*/ s16 data[8]; //2e, 30, 32, 34, 36, 38, 3a, 3c + /*0x2E*/ s16 data[8]; /*0x3E*/ u16 inUse:1; //1 u16 coordOffsetEnabled:1; //2 diff --git a/src/battle_anim_effects_3.c b/src/battle_anim_effects_3.c index a1484739e..cabe18fb6 100644 --- a/src/battle_anim_effects_3.c +++ b/src/battle_anim_effects_3.c @@ -5110,7 +5110,6 @@ void AnimTask_SnatchOpposingMonMove(u8 taskId) { personality = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_PERSONALITY); otId = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_OT_ID); - if (gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].transformSpecies == SPECIES_NONE) species = GetMonData(&gPlayerParty[gBattlerPartyIndexes[gBattleAnimAttacker]], MON_DATA_SPECIES); else |