From 648c6c7093f5173694562929f615380f297ad306 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Tue, 17 Jan 2017 13:41:12 +0100 Subject: Move `gStringVar` declarations to text.h --- src/battle_setup.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 1c3e8e836..21fa6a16a 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -12,6 +12,7 @@ #include "songs.h" #include "sound.h" #include "task.h" +#include "text.h" #include "string_util.h" #include "rng.h" #include "event_data.h" @@ -117,8 +118,6 @@ extern struct TrainerBattleSpec gTrainerBattleSpecs_2[]; extern struct TrainerBattleSpec gTrainerBattleSpecs_3[]; extern struct TrainerBattleSpec gTrainerBattleSpecs_4[]; -extern u8 gStringVar4[]; - extern u8 gBattleTransitionTable_Wild[][2]; extern u8 gBattleTransitionTable_Trainer[][2]; -- cgit v1.2.3 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/battle_setup.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 21fa6a16a..645eb1424 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -1,26 +1,26 @@ #include "global.h" #include "battle_setup.h" #include "asm.h" -#include "safari_zone.h" -#include "weather.h" -#include "palette.h" -#include "field_player_avatar.h" -#include "rom4.h" #include "battle.h" +#include "event_data.h" +#include "field_message_box.h" +#include "field_player_avatar.h" #include "main.h" -#include "species.h" +#include "metatile_behavior.h" +#include "palette.h" +#include "rng.h" +#include "rom4.h" +#include "safari_zone.h" +#include "script.h" #include "songs.h" #include "sound.h" +#include "species.h" +#include "starter_choose.h" +#include "string_util.h" #include "task.h" #include "text.h" -#include "string_util.h" -#include "rng.h" -#include "event_data.h" -#include "script.h" -#include "field_message_box.h" #include "trainer.h" -#include "starter_choose.h" -#include "metatile_behavior.h" +#include "weather.h" #define NUM_TRAINER_EYE_TRAINERS 56 #define TRAINER_REMATCH_STEPS 255 -- 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/battle_setup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 645eb1424..6d3e6a215 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -386,7 +386,7 @@ u16 GetSumOfPartyMonLevel(u8 numMons) for (i = 0; i < 6; i++) { u32 species = GetMonData(&gPlayerParty[i], MON_DATA_SPECIES2); - + if (species != SPECIES_EGG && species != SPECIES_NONE && GetMonData(&gPlayerParty[i], MON_DATA_HP) != 0) { sum += GetMonData(&gPlayerParty[i], MON_DATA_LEVEL); -- cgit v1.2.3