From 919f80321442bcdaa39ecb02e72f4d71ee03511f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 26 Feb 2018 13:24:46 +0100 Subject: correct move target defines --- src/battle_controllers.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3c8b1563f..cc366908a 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 -- cgit v1.2.3 From a9212eeb664efcdfb74a2f4bbc5e94f37e27e748 Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 27 Feb 2018 18:13:28 +0100 Subject: battle file more done and clean up tv --- src/battle_controllers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 3c8b1563f..3d5ffeb3a 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -121,10 +121,10 @@ void sub_8032768(void) } for (i = 0; i < sizeof(gBattleStruct->field_1A4); i++) - *(gBattleStruct->field_1A4 + i) = 0; + *((u8*)(&gBattleStruct->field_1A4) + i) = 0; for (i = 0; i < sizeof(gBattleStruct->field_204); i++) - *(gBattleStruct->field_204 + i) = 0; + *((u8*)(&gBattleStruct->field_204) + i) = 0; } static void InitSinglePlayerBtlControllers(void) -- cgit v1.2.3 From d29b9d268fe46322c740fe5ac440641834686f9d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Wed, 28 Feb 2018 00:18:59 +0100 Subject: make it compile --- src/battle_controllers.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/battle_controllers.c') 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) -- cgit v1.2.3