summaryrefslogtreecommitdiff
path: root/src/seagallop.c
diff options
context:
space:
mode:
authorultima-soul <akshayjhanji@hotmail.com>2020-03-13 00:32:04 -0700
committerultima-soul <akshayjhanji@hotmail.com>2020-03-13 00:32:04 -0700
commit99e4de062ae43aa978ad4f1a8cd70bc739c64c9d (patch)
tree1164d31577e6ebddc1cb313d40bb69ce0d426170 /src/seagallop.c
parent339c2914affc3c62ac9a5725aa1a0c7ccc3161ca (diff)
parent6af8c04d8fa6aaeaeb6c8b919e7770a65b9a883d (diff)
Merge branch 'master' into event_object_movement
Diffstat (limited to 'src/seagallop.c')
-rw-r--r--src/seagallop.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/seagallop.c b/src/seagallop.c
index aa0c48da1..1e2234b9c 100644
--- a/src/seagallop.c
+++ b/src/seagallop.c
@@ -16,7 +16,7 @@
#include "field_weather.h"
#include "constants/songs.h"
#include "constants/maps.h"
-#include "seagallop.h"
+#include "constants/seagallop.h"
#define TILESTAG_FERRY 3000
#define TILESTAG_WAKE 4000
@@ -295,7 +295,7 @@ static void Task_Seagallop_1(u8 taskId)
if (++task->data[1] == 140)
{
Overworld_FadeOutMapMusic();
- sub_807DC18();
+ WarpFadeOutScreen();
task->func = Task_Seagallop_2;
}
}