diff options
| author | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalax1@gmail.com> | 2017-09-21 17:55:30 -0400 |
| commit | d87ed69449da253a374170a8135200657fb0426b (patch) | |
| tree | 94baba568fc6dd25d082b309746198d41d07bd1b /src/fldeff_flash.c | |
| parent | aecddc277130652a90e00ad0cc314b7ef9765bbb (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into field_effect_helpers
Diffstat (limited to 'src/fldeff_flash.c')
| -rw-r--r-- | src/fldeff_flash.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index a63cbbbf1..1ee8a8f05 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -4,7 +4,7 @@ #include "main.h" #include "palette.h" #include "pokemon_menu.h" -#include "rom4.h" +#include "overworld.h" #include "rom6.h" #include "script.h" #include "songs.h" @@ -51,7 +51,7 @@ bool8 SetUpFieldMove_Flash(void) { if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH)) { - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_810CBFC; return TRUE; } @@ -123,8 +123,8 @@ void sub_810CC80(void) bool8 sub_810CD5C(void) { u8 i; - u8 v0 = get_map_light_from_warp0(); - u8 v1 = sav1_map_get_light_level(); + u8 v0 = get_map_type_from_warp0(); + u8 v1 = Overworld_GetMapTypeOfSaveblockLocation(); for (i = 0; gUnknown_083F7FC4[i].unk0; i++) { |