diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 21:10:54 -0400 |
| commit | e130a00cdf69c58dbff8e98a69559aeb33f87b60 (patch) | |
| tree | e128e502a2229f5d934f0436a0eb31dc86350bbb /src/seagallop.c | |
| parent | ef4c86fbfdd18b78700f61b629907a85579197c0 (diff) | |
| parent | d4cc0e161bf103d3d3e01fefa02e867d4a2053c2 (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/seagallop.c')
| -rw-r--r-- | src/seagallop.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/seagallop.c b/src/seagallop.c index ae880b2a3..e3333ef32 100644 --- a/src/seagallop.c +++ b/src/seagallop.c @@ -323,8 +323,8 @@ static void Task_SeaGallop_3(void) PlayRainStoppingSoundEffect(); PlaySE(SE_KAIDAN); gFieldCallback = sub_807DF64; - warp_in(); - SetMainCallback2(sub_805671C); + WarpIntoMap(); + SetMainCallback2(CB2_LoadMap); ResetInitialPlayerAvatarState(); FreeFerrySpriteResources(); Free(sBg3TilemapBuffer); |