From 6046f214e335e124200441f27f5fa0b3eae6cc76 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 20 Jun 2017 19:20:11 -0500 Subject: decompile sub_8030A3C - PlayerHandleLinkStandbyMsg --- src/battle_811DA74.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/battle_811DA74.c') diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 743dd2554..f448231be 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -35,15 +35,7 @@ struct UnknownStruct3 u8 ppBonuses; }; -struct UnknownStruct5 -{ - u8 unk0_0:7; - u8 unk0_7:1; -}; - extern u16 gBattleTypeFlags; - -extern struct UnknownStruct5 gUnknown_020238C8; extern u8 gDisplayedStringBattle[]; extern u8 gBattleBufferA[][0x200]; extern u8 gActiveBank; -- cgit v1.2.3 From 56235a29d45d76e21592d5d363a5bb7a0ae9059a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 22 Jun 2017 13:52:30 -0500 Subject: finish decompiling battle_6 --- src/battle_811DA74.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/battle_811DA74.c') diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index f448231be..00d7ffcfa 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -425,6 +425,7 @@ void LinkPartnerHandleGetAttributes(void) LinkPartnerBufferExecCompleted(); } +// Duplicate of dp01_getattr_by_ch1_for_player_pokemon u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; @@ -757,6 +758,7 @@ void LinkPartnerHandleSetAttributes(void) LinkPartnerBufferExecCompleted(); } +// Duplicate of dp01_setattr_by_ch1_for_player_pokemon void sub_811EC68(u8 a) { struct BattlePokemon *battlePokemon = (struct BattlePokemon *)&gBattleBufferA[gActiveBank][3]; -- cgit v1.2.3 From f62282f0b994458b08e8ed8fcc03b39f6d96df7d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Thu, 22 Jun 2017 13:53:47 -0500 Subject: correct comment about duplicate function --- src/battle_811DA74.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_811DA74.c') diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 00d7ffcfa..42c700844 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -425,7 +425,7 @@ void LinkPartnerHandleGetAttributes(void) LinkPartnerBufferExecCompleted(); } -// Duplicate of dp01_getattr_by_ch1_for_player_pokemon +// Duplicate of dp01_getattr_by_ch1_for_player_pokemon_ u32 dp01_getattr_by_ch1_for_player_pokemon(u8 a, u8 *buffer) { struct BattlePokemon battlePokemon; -- cgit v1.2.3 From 53d0a33035cf5654c6f4e005821a67fa8322a055 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 24 Jun 2017 13:35:43 -0500 Subject: decompile sub_803995C - sub_803A030 --- src/battle_811DA74.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_811DA74.c') diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 743dd2554..4aab0328c 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -1169,7 +1169,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); -- cgit v1.2.3 From 826cfdb74ba6e66dac9e8e026bd7411719726642 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 25 Jun 2017 19:03:49 -0500 Subject: finish decompiling battle_10 --- src/battle_811DA74.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/battle_811DA74.c') diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c index 4aab0328c..31021112a 100644 --- a/src/battle_811DA74.c +++ b/src/battle_811DA74.c @@ -1415,10 +1415,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; @@ -1578,9 +1580,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; -- cgit v1.2.3