From c9722602cb47eb5b6ecbccddf13df5f286a8ef7b Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:13:04 +0100 Subject: Sort includes --- src/calculate_base_damage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'src/calculate_base_damage.c') diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index 86446e588..9f34b0a43 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -1,17 +1,17 @@ #include "global.h" -#include "text.h" -#include "string_util.h" -#include "pokemon.h" -#include "species.h" -#include "main.h" -#include "sprite.h" -#include "berry.h" -#include "item.h" #include "abilities.h" -#include "hold_effects.h" -#include "event_data.h" #include "battle.h" +#include "berry.h" +#include "event_data.h" +#include "hold_effects.h" +#include "item.h" #include "items.h" +#include "main.h" +#include "pokemon.h" +#include "species.h" +#include "sprite.h" +#include "string_util.h" +#include "text.h" extern u8 gPlayerPartyCount; extern struct Pokemon gPlayerParty[6]; -- cgit v1.2.3 From 801877553db80267a62c0c3c0b2805b6716d1ef9 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 14:38:44 +0100 Subject: Remove trailing whitespace --- src/calculate_base_damage.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/calculate_base_damage.c') diff --git a/src/calculate_base_damage.c b/src/calculate_base_damage.c index 9f34b0a43..8e020829a 100644 --- a/src/calculate_base_damage.c +++ b/src/calculate_base_damage.c @@ -307,7 +307,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de // does lack of sun half solar beam damage? if ((gBattleWeather & 0x9F) && gUnknown_02024BE6 == 76) damage /= 2; - + // sunny? if (gBattleWeather & 0x60) { -- cgit v1.2.3