diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-02 23:32:39 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-10-02 23:32:39 +0200 |
| commit | db58d5e24a89d9c411231a74ce01daed7a303d67 (patch) | |
| tree | 9b4e178713a97421246c3ebe3706b8aa302bab7a /src/battle_3.c | |
| parent | d4e1c417d37b097bd8e7539e87a75f7026d4dc9a (diff) | |
battle2 3500 C lines
Diffstat (limited to 'src/battle_3.c')
| -rw-r--r-- | src/battle_3.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/battle_3.c b/src/battle_3.c index e42d9317d..071e4d59d 100644 --- a/src/battle_3.c +++ b/src/battle_3.c @@ -178,9 +178,6 @@ extern const u8 gStatusConditionString_ConfusionJpn[]; extern const u8 gStatusConditionString_LoveJpn[]; extern const u16 gSoundMovesTable[]; -extern u8 b_first_side(u8, u8, u8); -extern void sub_803CEDC(u8, u8); -extern void BattleTurnPassed(void); extern void sub_803F9EC(); extern bool8 sub_80423F4(u8 bank, u8, u8); extern u8 weather_get_current(void); @@ -414,7 +411,7 @@ u8 UpdateTurnCounters(void) s32 j; for (j = i + 1; j < gNoOfAllBanks; j++) { - if (b_first_side(gTurnOrder[i], gTurnOrder[j], 0)) + if (GetWhoStrikesFirst(gTurnOrder[i], gTurnOrder[j], 0)) sub_803CEDC(i, j); } } @@ -1667,7 +1664,7 @@ u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg) gBankAttacker = bank; switch (gLastUsedAbility) { - case 0xFF: //weather from overworld + case ABILITYEFFECT_SWITCH_IN_WEATHER: //_08042A86 switch (weather_get_current()) { |