diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-31 17:37:03 -0600 |
| commit | 46023e742c7704c449ae7ec9c2a592cd923f40e6 (patch) | |
| tree | 9f6c6591e60f83003f6abccb5a28cfb3004ad2ab /include/fldeff_poison.h | |
| parent | cb674ce14dc43f99dd76f456e69ab8a90cc3d506 (diff) | |
| parent | 2bd2dd1db7252a928a84cd65ea0510ed1533fa9b (diff) | |
Merge branch 'master' into german_debug
Conflicts:
asm/pokemon_storage_system.s
data/pokemon_storage_system.s
src/pokemon/pokemon_1.c
src/pokemon/pokemon_storage_system.c
sym_common.txt
sym_ewram.txt
Diffstat (limited to 'include/fldeff_poison.h')
| -rw-r--r-- | include/fldeff_poison.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/fldeff_poison.h b/include/fldeff_poison.h index fe3308ba9..abcacbd03 100644 --- a/include/fldeff_poison.h +++ b/include/fldeff_poison.h @@ -1,7 +1,7 @@ #ifndef GUARD_FLDEFF_POISON_H #define GUARD_FLDEFF_POISON_H -void DoFieldPoisonEffect(void); -bool32 FieldPoisonEffectIsRunning(void); +void FldeffPoison_Start(void); +bool32 FldeffPoison_IsActive(void); #endif // GUARD_FLDEFF_POISON_H |