summaryrefslogtreecommitdiff
path: root/src/fldeff_softboiled.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2018-03-02 21:49:09 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2018-03-02 21:49:09 -0500
commitdf128cbfedcaf8a0da698ba9a9e62bed21721e1c (patch)
tree6f12e1991e59856f83711d469020072a5321da3e /src/fldeff_softboiled.c
parente3b078d08fb7208065cb6bda96879fbb6e97c5db (diff)
parent0a9f0d80f5f3d1cf02ae26a7bad1d771f8dedc52 (diff)
Merge branch 'master' into pokenav_match_call
Diffstat (limited to 'src/fldeff_softboiled.c')
-rw-r--r--src/fldeff_softboiled.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index b61cf9f32..d0a40a9a9 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -9,10 +9,10 @@
#include "strings.h"
#include "task.h"
-void sub_816166C(u8 taskId);
-void sub_81617B8(u8 taskId);
-void sub_81616C0(u8 taskId);
-void sub_8161724(u8 taskId);
+static void sub_816166C(u8 taskId);
+static void sub_81616C0(u8 taskId);
+static void sub_8161724(u8 taskId);
+static void sub_81617B8(u8 taskId);
bool8 SetUpFieldMove_SoftBoiled(void)
{
@@ -63,13 +63,13 @@ void sub_81615A8(u8 taskId)
sub_81B1F18(taskId, unk9, -1, GetMonData(&gPlayerParty[unk9], MON_DATA_MAX_HP)/5, sub_816166C);
}
-void sub_816166C(u8 taskId)
+static void sub_816166C(u8 taskId)
{
PlaySE(SE_KAIFUKU);
sub_81B1F18(taskId, gUnknown_0203CEC8.unkA, 1, GetMonData(&gPlayerParty[gUnknown_0203CEC8.unk9], MON_DATA_MAX_HP)/5, sub_81616C0);
}
-void sub_81616C0(u8 taskId)
+static void sub_81616C0(u8 taskId)
{
GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.unkA], gStringVar1);
StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
@@ -78,7 +78,7 @@ void sub_81616C0(u8 taskId)
gTasks[taskId].func = sub_8161724;
}
-void sub_8161724(u8 taskId)
+static void sub_8161724(u8 taskId)
{
if(sub_81B1BD4() == 1)
return;
@@ -92,7 +92,7 @@ void sub_8161724(u8 taskId)
gTasks[taskId].func = sub_81B1370;
}
-void sub_8161784(u8 taskId)
+static void sub_8161784(u8 taskId)
{
if(sub_81B1BD4() == 1)
return;
@@ -100,7 +100,7 @@ void sub_8161784(u8 taskId)
gTasks[taskId].func = sub_81B1370;
}
-void sub_81617B8(u8 taskId)
+static void sub_81617B8(u8 taskId)
{
PlaySE(SE_SELECT);
sub_81B1B5C(&gText_CantBeUsedOnPkmn, 0);