summaryrefslogtreecommitdiff
path: root/src/battle_controller_player.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2021-07-06 13:31:18 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2021-07-06 13:31:18 -0400
commit12395bc1152c70db86d7d1fe530896d3eca491c7 (patch)
treed79a200a0ab59e2eea005ba172d3aecaa1d9d994 /src/battle_controller_player.c
parent7109f880c9150dbdcd4e8581b7f065ec06dff022 (diff)
Merge two battle interface related structs
Diffstat (limited to 'src/battle_controller_player.c')
-rw-r--r--src/battle_controller_player.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c
index 6f61f29b1..ddeefcc32 100644
--- a/src/battle_controller_player.c
+++ b/src/battle_controller_player.c
@@ -2969,7 +2969,7 @@ void PlayerHandlecmd48(void)
else
{
ewram17810[gActiveBattler].unk0_0 = 1;
- gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct BattleInterfaceStruct2 *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
+ gUnknown_02024E68[gActiveBattler] = sub_8044804(gActiveBattler, (struct HpAndStatus *)&gBattleBufferA[gActiveBattler][4], gBattleBufferA[gActiveBattler][1], gBattleBufferA[gActiveBattler][2]);
ewram17810[gActiveBattler].unk5 = 0;
if (gBattleBufferA[gActiveBattler][2] != 0)
ewram17810[gActiveBattler].unk5 = 0x5D;