summaryrefslogtreecommitdiff
path: root/src/egg_hatch.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-20 10:49:21 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-20 10:49:21 +0200
commitb65da491a97e77ed2aa122ab7342c7fb94d35606 (patch)
tree02e7c17f29426d6bca7bae4d133e1462dc81c355 /src/egg_hatch.c
parent9ccc472b97b1a7f85703f813665cb4a30f7891b6 (diff)
parentae5aa3c4dfd81fc25e5abeef1b915bb2da68b8d1 (diff)
merge with master, fix conflicts
Diffstat (limited to 'src/egg_hatch.c')
-rw-r--r--src/egg_hatch.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index a1f187b85..589e8901d 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -462,7 +462,7 @@ static void VBlankCB_EggHatch(void)
TransferPlttBuffer();
}
-static void EggHatch(void)
+void EggHatch(void)
{
ScriptContext2_Enable();
CreateTask(Task_EggHatch, 10);