diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-04-06 21:31:08 -0400 |
| commit | 07b800e593a3ac8dd1a9bcfb6cb2366cc5c27377 (patch) | |
| tree | c77edf7fdacf36172bd3b6af790ad86111aef1fe /src/overworld.c | |
| parent | 4d3098e89b5aebf080547a99e68640138dc74599 (diff) | |
| parent | be66a5cfefe578a0efb42d47fe8ed1a08e7fe30a (diff) | |
Merge branch 'master' into unk_debug_menu_3
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/overworld.c b/src/overworld.c index 6376aa1af..e98e5a6a1 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1415,10 +1415,10 @@ void sub_805465C(void) c2_exit_to_overworld_2_switch(); } -void sub_805469C(void) +void c2_exit_to_overworld_1_sub_8080DEC(void) { FieldClearVBlankHBlankCallbacks(); - gFieldCallback = atk17_seteffectsecondary; + gFieldCallback = sub_8080DEC; c2_exit_to_overworld_2_switch(); } |