diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:22 -0600 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-27 15:43:29 -0600 |
| commit | 4767f21f2e72ae89ab542d61a86d5fbbe85df1a2 (patch) | |
| tree | 985706af891626bcf4335ad26758dbdcef617cf5 /src/field | |
| parent | 16e0d8089194a8d098da47c7a7b07fbc4dcc0292 (diff) | |
Port updated battle_script macros from pokeemerald
Diffstat (limited to 'src/field')
| -rw-r--r-- | src/field/field_fadetransition.c | 2 | ||||
| -rw-r--r-- | src/field/overworld.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/field/field_fadetransition.c b/src/field/field_fadetransition.c index 829ce2dfa..5014e97e3 100644 --- a/src/field/field_fadetransition.c +++ b/src/field/field_fadetransition.c @@ -327,7 +327,7 @@ void sub_8080DC4(u8 taskId) } } -void atk17_seteffectuser(void) +void atk17_seteffectsecondary(void) { pal_fill_black(); CreateStartMenuTask(sub_8080DC4); diff --git a/src/field/overworld.c b/src/field/overworld.c index d0e40eac3..c4d01f907 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -1329,7 +1329,7 @@ void sub_805465C(void) void sub_805469C(void) { FieldClearVBlankHBlankCallbacks(); - gFieldCallback = atk17_seteffectuser; + gFieldCallback = atk17_seteffectsecondary; c2_exit_to_overworld_2_switch(); } |