diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-02-17 04:03:59 -0600 |
| commit | ebd88b36060e8958fbf5f3b2028629575c79a243 (patch) | |
| tree | 101cf777ea827ff7e68069c5ad45822a629ea75c /src/decoration.c | |
| parent | 1605f6253564e4e5f67dd295a1ac70145e5c1c9d (diff) | |
| parent | e2932a38ded59a6b794d10024498db718c0b0bb9 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into intro
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/decoration.c b/src/decoration.c index 8eb875560..c1b12a4d3 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -38,6 +38,8 @@ #include "decoration.h" #include "graphics.h" +extern void (*gFieldCallback)(void); + // Static type declarations #define OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG 0xbe5 @@ -1682,7 +1684,7 @@ void c1_overworld_prev_quest(u8 taskId) sub_812A3C8(); FreeSpritePaletteByTag(OVERWORLD_PLACE_DECOR_SELECTOR_PAL_TAG); gFieldCallback = sub_8128CD4; - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); DestroyTask(taskId); break; } @@ -2673,7 +2675,7 @@ void sub_812A25C(u8 taskId) case 1: sub_812A3C8(); gFieldCallback = sub_812A334; - SetMainCallback2(c2_exit_to_overworld_2_switch); + SetMainCallback2(CB2_ReturnToField); DestroyTask(taskId); break; } |