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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/field/fldeff_poison.c b/src/field/fldeff_poison.c
index b0052d59d..52afc2516 100644
--- a/src/field/fldeff_poison.c
+++ b/src/field/fldeff_poison.c
@@ -32,13 +32,13 @@ static void Task_FieldPoisonEffect(u8 taskId)
     REG_MOSAIC = (data[1] << 4) | data[1];
 }
 
-void DoFieldPoisonEffect(void)
+void FldeffPoison_Start(void)
 {
     PlaySE(SE_DOKU);
     CreateTask(Task_FieldPoisonEffect, 80);
 }
 
-bool32 FieldPoisonEffectIsRunning(void)
+bool32 FldeffPoison_IsActive(void)
 {
     return FuncIsActiveTask(Task_FieldPoisonEffect);
 }