diff options
Diffstat (limited to 'src/battle_811DA74.c')
| -rw-r--r-- | src/battle_811DA74.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 42c700844..36a287efc 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -1163,7 +1163,7 @@ void sub_811FDF0(void) void sub_811FDFC(void) { - if (mplay_80342A4(gActiveBank) == 0) + if (!mplay_80342A4(gActiveBank)) { u32 r0 = gBattleBufferA[gActiveBank][1] | (gBattleBufferA[gActiveBank][2] << 8); @@ -1409,10 +1409,12 @@ void sub_81203FC(void) void LinkPartnerHandleHitAnimation(void) { if (gSprites[gObjectBankIDs[gActiveBank]].invisible == TRUE) + { LinkPartnerBufferExecCompleted(); + } else { - gDoingBattleAnim = 1; + gDoingBattleAnim = TRUE; gSprites[gObjectBankIDs[gActiveBank]].data1 = 0; sub_8047858(gActiveBank); gBattleBankFunc[gActiveBank] = bx_blink_t3; @@ -1572,9 +1574,8 @@ void sub_81209D8(void) { u8 r3 = gBattleBufferA[gActiveBank][1]; u16 r4 = gBattleBufferA[gActiveBank][2] | (gBattleBufferA[gActiveBank][3] << 8); - u8 var = gActiveBank; - if (move_anim_start_t3(var, var, var, r3, r4) != 0) + if (move_anim_start_t3(gActiveBank, gActiveBank, gActiveBank, r3, r4) != 0) LinkPartnerBufferExecCompleted(); else gBattleBankFunc[gActiveBank] = sub_811E3B8; |