diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-03-02 21:49:09 -0500 |
| commit | df128cbfedcaf8a0da698ba9a9e62bed21721e1c (patch) | |
| tree | 6f12e1991e59856f83711d469020072a5321da3e /src/battle_controllers.c | |
| parent | e3b078d08fb7208065cb6bda96879fbb6e97c5db (diff) | |
| parent | 0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff) | |
Merge branch 'master' into pokenav_match_call
Diffstat (limited to 'src/battle_controllers.c')
| -rw-r--r-- | src/battle_controllers.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3c8b1563f..8bd654c29 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -36,7 +36,6 @@ extern u8 gBattleBuffersTransferData[0x100]; static EWRAM_DATA u8 sBattleBuffersTransferData[0x100] = {}; -extern const struct BattleMove gBattleMoves[]; extern void task00_08081A90(u8 taskId); // cable_club extern void sub_81B8D64(u8 bank, u8 arg1); // party_menu @@ -97,7 +96,6 @@ void SetUpBattleVarsAndBirchZigzagoon(void) void sub_8032768(void) { s32 i; - u8 *data; if (!(gBattleTypeFlags & BATTLE_TYPE_RECORDED)) sub_8184DA4(1); @@ -120,11 +118,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) |