diff options
author | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
---|---|---|
committer | scnorton <scnorton@biociphers.org> | 2017-12-18 15:00:57 -0500 |
commit | 89c0d40ee6c7fa2ad9f7f44e3a51ea50264e9280 (patch) | |
tree | f5387471637b5e9e62fa5b6a0614a935b2921118 /src/field/fldeff_flash.c | |
parent | 408f3cf295e76b61f2c1a442c80d1036bbaa9d28 (diff) | |
parent | 3c5f725de49371aced1788a21f5e53df5b498b5f (diff) |
Merge branch 'master' into decompile_data
Diffstat (limited to 'src/field/fldeff_flash.c')
-rw-r--r-- | src/field/fldeff_flash.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 920791ce2..22f170184 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -73,7 +73,7 @@ static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transitio bool8 SetUpFieldMove_Flash(void) { - if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH)) + if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) { gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_810CBFC; @@ -94,7 +94,7 @@ void sub_810CBFC(void) void sub_810CC34(void) { PlaySE(SE_W115); - FlagSet(SYS_USE_FLASH); + FlagSet(FLAG_SYS_USE_FLASH); ScriptContext1_SetupScript(gUnknown_081B694A); } |