summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2018-02-03 13:39:04 -0500
committeryenatch <yenatch@gmail.com>2018-02-03 13:39:04 -0500
commitb07c9d88326dc5b1383a2179a24b4c5ba954474a (patch)
tree9a17ae98ecd3f73326ee7a8f7df7ca0c73063f7f /src
parent204d3e45f0c0843ada1243897d36e873059efde1 (diff)
fix a goto in battle_2
Diffstat (limited to 'src')
-rw-r--r--src/battle/battle_2.c16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/battle/battle_2.c b/src/battle/battle_2.c
index 2ad2adb04..6f885b20e 100644
--- a/src/battle/battle_2.c
+++ b/src/battle/battle_2.c
@@ -727,16 +727,14 @@ void sub_800F298(void)
ZeroPlayerPartyMons();
ZeroEnemyPartyMons();
gBattleCommunication[0]++;
- goto step_2;
- }
- break;
+ // fallthrough
case 2:
- step_2:
- if (IsLinkTaskFinished())
- {
- SendBlock(bitmask_all_link_players_but_self(), ewram1D000, sizeof(struct Pokemon) * 2);
- gBattleCommunication[0]++;
- }
+ if (IsLinkTaskFinished())
+ {
+ SendBlock(bitmask_all_link_players_but_self(), ewram1D000, sizeof(struct Pokemon) * 2);
+ gBattleCommunication[0]++;
+ }
+ }
break;
case 3:
if ((GetBlockReceivedStatus() & 0xF) == 0xF)