From e1e2132a37e188372f3923cdb741897978cb6e2a Mon Sep 17 00:00:00 2001 From: garak Date: Sun, 9 Dec 2018 22:24:54 -0500 Subject: sync fldeff function names with pokeruby --- src/battle_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index ab2a12fb7..d4b25021e 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -56,7 +56,7 @@ struct TrainerBattleParameter }; extern bool32 InTrainerHill(void); -extern bool32 FieldPoisonEffectIsRunning(void); +extern bool32 FldeffPoison_IsActive(void); extern void RestartWildEncounterImmunitySteps(void); extern void ClearPoisonStepCounter(void); extern void sub_81BE72C(void); @@ -337,7 +337,7 @@ static void Task_BattleStart(u8 taskId) switch (tState) { case 0: - if (!FieldPoisonEffectIsRunning()) // is poison not active? + if (!FldeffPoison_IsActive()) // is poison not active? { BattleTransition_StartOnField(tTransition); sub_81BE72C(); -- cgit v1.2.3 From 5eac3ce1a2503a2d358033b7e0242c1ecd2b63e3 Mon Sep 17 00:00:00 2001 From: garak Date: Wed, 19 Dec 2018 22:19:54 -0500 Subject: rename fldeff_misc --- src/battle_setup.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 0705bd9f6..83ced1b7c 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -57,7 +57,7 @@ struct TrainerBattleParameter }; extern bool32 InTrainerHill(void); -extern bool32 FldeffPoison_IsActive(void); +extern bool32 FldEffPoison_IsActive(void); extern void RestartWildEncounterImmunitySteps(void); extern void ClearPoisonStepCounter(void); extern void sub_81BE72C(void); @@ -338,7 +338,7 @@ static void Task_BattleStart(u8 taskId) switch (tState) { case 0: - if (!FldeffPoison_IsActive()) // is poison not active? + if (!FldEffPoison_IsActive()) // is poison not active? { BattleTransition_StartOnField(tTransition); sub_81BE72C(); -- cgit v1.2.3 From 9320fe8f8533ae3f0f8ef638f7cc6a51076af21f Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 24 Dec 2018 00:02:29 +0100 Subject: Clear includes --- src/battle_setup.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_setup.c') diff --git a/src/battle_setup.c b/src/battle_setup.c index 83ced1b7c..1ad5dcf4f 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -24,6 +24,7 @@ #include "window.h" #include "event_object_movement.h" #include "event_scripts.h" +#include "tv.h" #include "trainer_see.h" #include "field_message_box.h" #include "sound.h" @@ -36,6 +37,9 @@ #include "gym_leader_rematch.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "fldeff_misc.h" +#include "field_control_avatar.h" +#include "fldeff_groundshake.h" #include "constants/map_types.h" #include "constants/battle_frontier.h" @@ -57,12 +61,8 @@ struct TrainerBattleParameter }; extern bool32 InTrainerHill(void); -extern bool32 FldEffPoison_IsActive(void); -extern void RestartWildEncounterImmunitySteps(void); extern void ClearPoisonStepCounter(void); -extern void sub_81BE72C(void); extern void sub_808BCF4(void); -extern void sub_80EECC8(void); extern void sub_80AF6F0(void); extern u16 sub_81D6180(u8 localId); extern bool8 GetTrainerHillTrainerFlag(u8 eventObjId); -- cgit v1.2.3 From 442b1826a276d9270092b7f3e43de1dd87150f4d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Mon, 24 Dec 2018 21:59:05 +0100 Subject: asm party and fldeff clean-up --- 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 1ad5dcf4f..56bed77c8 100644 --- a/src/battle_setup.c +++ b/src/battle_setup.c @@ -37,9 +37,9 @@ #include "gym_leader_rematch.h" #include "battle_pike.h" #include "battle_pyramid.h" +#include "fldeff.h" #include "fldeff_misc.h" #include "field_control_avatar.h" -#include "fldeff_groundshake.h" #include "constants/map_types.h" #include "constants/battle_frontier.h" -- cgit v1.2.3