From 12395bc1152c70db86d7d1fe530896d3eca491c7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 6 Jul 2021 13:31:18 -0400 Subject: Merge two battle interface related structs --- src/battle_controller_player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_controller_player.c') 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; -- cgit v1.2.3