diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-06-19 15:29:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-19 15:29:24 +0200 |
| commit | 11ad653b57d811dbe8df831d4987128da39bdcb5 (patch) | |
| tree | 9e9a793c7dc9a4af7992e6b65c0418d16b25a400 /src/fldeff_teleport.c | |
| parent | 48a15638c63f2b3d4b2d12d346e466ddca006570 (diff) | |
| parent | 13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff) | |
Merge pull request #1 from pret/master
be up to date with the master
Diffstat (limited to 'src/fldeff_teleport.c')
| -rw-r--r-- | src/fldeff_teleport.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c index 0e6933649..df12d3072 100644 --- a/src/fldeff_teleport.c +++ b/src/fldeff_teleport.c @@ -1,26 +1,23 @@ #include "global.h" -#include "asm.h" +#include "fldeff_teleport.h" #include "field_effect.h" #include "field_player_avatar.h" +#include "pokemon_menu.h" #include "rom4.h" #include "rom6.h" - -extern void sub_8087BA8(void); +#include "task.h" extern u32 gUnknown_0202FF84[]; -extern void (*gUnknown_0300485C)(void); +extern void (*gFieldCallback)(void); extern u8 gLastFieldPokeMenuOpened; extern void (*gUnknown_03005CE4)(void); -void hm_teleport_run_dp02scr(void); -void sub_814A404(void); - bool8 SetUpFieldMove_Teleport(void) { if (is_light_level_1_2_3_or_6(gMapHeader.mapType) == TRUE) { - gUnknown_0300485C = sub_808AB90; + gFieldCallback = sub_808AB90; gUnknown_03005CE4 = hm_teleport_run_dp02scr; return TRUE; } |