diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_controllers.c | 9 | ||||
| -rw-r--r-- | src/battle_tv.c | 3 | ||||
| -rw-r--r-- | src/tv.c | 1 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3d5ffeb3a..97f82ed0c 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -97,7 +97,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void) void sub_8032768(void) { s32 i; - u8 *data; if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) sub_8184DA4(1); @@ -120,11 +119,11 @@ void sub_8032768(void) sub_81B8D64(i, 0); } - for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++) - *((u8*)(&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++) - *((u8*)(&gBattleStruct->field_204) + i) = 0; + for (i = 0; i < sizeof(gBattleStruct->tv); i++) + *((u8*)(&gBattleStruct->tv) + i) = 0; } static void InitSinglePlayerBtlControllers(void) diff --git a/src/battle_tv.c b/src/battle_tv.c index bd3de548b..e23fba2c4 100644 --- a/src/battle_tv.c +++ b/src/battle_tv.c @@ -766,9 +766,8 @@ void TryPutLinkBattleTvShowOnAir(void) species = GetMonData(&gEnemyParty[i], MON_DATA_SPECIES, NULL); if (species != SPECIES_NONE && !GetMonData(&gEnemyParty[i], MON_DATA_IS_EGG, NULL)) { - s32 id = 1; for (sum = 0, j = 0; j < 4; j++) - sum += movePoints->points[id][i * 4 + j]; + sum += movePoints->points[1][i * 4 + j]; if (opponentBestSum == sum) { @@ -1789,7 +1789,6 @@ void EndMassOutbreak(void) void UpdateTVShowsPerDay(u16 days) { - sub_80ED8B4(days); UpdateMassOutbreakTimeLeft(days); sub_80EF120(days); |