merge with master

1 files changed, 4 insertions, 5 deletions

diff --git a/src/battle_controllers.c b/src/battle_controllers.c
index 30411fbb9..2b918d018 100644
--- a/src/battle_controllers.c
+++ b/src/battle_controllers.c
@@ -77,7 +77,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void)
 void sub_8032768(void)
 {
     s32 i;
-    u8 *data;
 
     if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED))
         sub_8184DA4(1);
@@ -100,11 +99,11 @@ void sub_8032768(void)
             sub_81B8D64(i, 0);
     }
 
-    for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++)
-        *(gBattleStruct->field_1A4 + i) = 0;
+    for (i = 0; i < sizeof(gBattleStruct->tvMovePoints); i++)
+        *((u8*)(&gBattleStruct->tvMovePoints) + i) = 0;
 
-    for (i = 0; i < sizeof(gBattleStruct->field_204); i++)
-        *(gBattleStruct->field_204 + i) = 0;
+    for (i = 0; i < sizeof(gBattleStruct->tv); i++)
+        *((u8*)(&gBattleStruct->tv) + i) = 0;
 }
 
 static void InitSinglePlayerBtlControllers(void)