diff options
-rw-r--r-- | include/fldeff_80C5CD4.h | 9 | ||||
-rw-r--r-- | include/fldeff_poison.h | 7 | ||||
-rw-r--r-- | include/fldeff_recordmixing.h | 7 | ||||
-rw-r--r-- | src/battle/battle_setup.c | 2 | ||||
-rw-r--r-- | src/engine/record_mixing.c | 2 | ||||
-rw-r--r-- | src/field/field_poison.c | 2 | ||||
-rw-r--r-- | src/field/fldeff_poison.c | 4 |
7 files changed, 19 insertions, 14 deletions
diff --git a/include/fldeff_80C5CD4.h b/include/fldeff_80C5CD4.h deleted file mode 100644 index 413e8ad96..000000000 --- a/include/fldeff_80C5CD4.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef GUARD_FLDEFF_80C5CD4_H -#define GUARD_FLDEFF_80C5CD4_H - -void DoFieldPoisonEffect(void); -bool32 FieldPoisonEffectIsRunning(void); -void CreateRecordMixingSprite(void); -void DestroyRecordMixingSprite(void); - -#endif // GUARD_FLDEFF_80C5CD4_H diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h new file mode 100644 index 000000000..fe3308ba9 --- /dev/null +++ b/include/fldeff_poison.h @@ -0,0 +1,7 @@ +#ifndef GUARD_FLDEFF_POISON_H +#define GUARD_FLDEFF_POISON_H + +void DoFieldPoisonEffect(void); +bool32 FieldPoisonEffectIsRunning(void); + +#endif // GUARD_FLDEFF_POISON_H diff --git a/include/fldeff_recordmixing.h b/include/fldeff_recordmixing.h new file mode 100644 index 000000000..6afbc0ae1 --- /dev/null +++ b/include/fldeff_recordmixing.h @@ -0,0 +1,7 @@ +#ifndef GUARD_FLDEFF_RECORDMIXING_H +#define GUARD_FLDEFF_RECORDMIXING_H + +void CreateRecordMixingSprite(void); +void DestroyRecordMixingSprite(void); + +#endif // GUARD_FLDEFF_RECORDMIXING_H diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 8327ed59d..dab87b462 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -11,7 +11,7 @@ #include "field_player_avatar.h" #include "field_weather.h" #include "fieldmap.h" -#include "fldeff_80C5CD4.h" +#include "fldeff_poison.h" #include "main.h" #include "map_constants.h" #include "metatile_behavior.h" diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index b30d57a4d..cf51bec9e 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -5,7 +5,7 @@ #include "daycare.h" #include "dewford_trend.h" #include "event_data.h" -#include "fldeff_80C5CD4.h" +#include "fldeff_recordmixing.h" #include "item.h" #include "items.h" #include "load_save.h" diff --git a/src/field/field_poison.c b/src/field/field_poison.c index b6ff12ff9..74d70cb36 100644 --- a/src/field/field_poison.c +++ b/src/field/field_poison.c @@ -1,7 +1,7 @@ #include "global.h" #include "field_poison.h" #include "field_message_box.h" -#include "fldeff_80C5CD4.h" +#include "fldeff_poison.h" #include "pokemon.h" #include "pokemon_summary_screen.h" #include "script.h" diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c index b751ee564..8f4edb215 100644 --- a/src/field/fldeff_poison.c +++ b/src/field/fldeff_poison.c @@ -31,13 +31,13 @@ static void Task_FieldPoisonEffect(u8 taskId) REG_MOSAIC = (data[1] << 4) | data[1]; } -void DoFieldPoisonEffect() +void DoFieldPoisonEffect(void) { PlaySE(SE_DOKU); CreateTask(Task_FieldPoisonEffect, 80); } -bool8 FieldPoisonEffectIsRunning(void) +bool32 FieldPoisonEffectIsRunning(void) { return FuncIsActiveTask(Task_FieldPoisonEffect); } |