From 9b459eb64addae312376df0e73708eaf52e28f6c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 9 Dec 2019 08:41:09 +0100
Subject: [PATCH] Fix atk49state

---
 src/battle_interface.c       | 21 ---------------------
 src/battle_script_commands.c |  6 +++---
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/src/battle_interface.c b/src/battle_interface.c
index 278a0d488d..3d2c9fe15d 100644
--- a/src/battle_interface.c
+++ b/src/battle_interface.c
@@ -499,27 +499,6 @@ static const struct SpriteSheet sStatusSummaryBallsSpriteSheet =
     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 =
 {
     .y = 0,
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c
index 391789bca0..eb95ea07e6 100644
--- a/src/battle_script_commands.c
+++ b/src/battle_script_commands.c
@@ -4673,7 +4673,7 @@ static void Cmd_moveend(void)
             if (gBattleMoves[gCurrentMove].flags & FLAG_DANCE)
             {
                 u8 battler, nextDancer = 0;
-                
+
                 if (!(gBattleStruct->lastMoveFailed & gBitTable[gBattlerAttacker]
                     || (!gSpecialStatuses[gBattlerAttacker].dancerUsedMove
                         && gProtectStructs[gBattlerAttacker].usesBouncedMove)))
@@ -4690,14 +4690,14 @@ static void Cmd_moveend(void)
                         if (GetBattlerAbility(battler) == ABILITY_DANCER && !gSpecialStatuses[battler].dancerUsedMove)
                         {
                             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))
                         effect = TRUE;
                 }
             }
-            gBattleScripting.atk49_state++;
+            gBattleScripting.moveendState++;
             break;
         case MOVEEND_CLEAR_BITS: // Clear bits active while using a move for all targets and all hits.
             if (gSpecialStatuses[gBattlerAttacker].instructedChosenTarget)