diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:21:10 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-02-21 21:22:10 -0500 |
| commit | eca329f9c500d89f451a4ab88f65da79c112bf71 (patch) | |
| tree | 7fd4fa77064398ad1a19354df534f31f8355f839 /src/fldeff_flash.c | |
| parent | 0a7b97ee0605e48a34c7af193a26d770c6d23d29 (diff) | |
| parent | b105d20d1e0297d0c858fe99a0946e5c07da81c1 (diff) | |
Merge branch 'master' into multiplayer-stuff
Diffstat (limited to 'src/fldeff_flash.c')
| -rw-r--r-- | src/fldeff_flash.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c index f3bd76cbf..c002f700f 100644 --- a/src/fldeff_flash.c +++ b/src/fldeff_flash.c @@ -74,11 +74,13 @@ static const u32 gCaveTransitionTiles[] = INCBIN_U32("graphics/misc/cave_transit // text bool8 SetUpFieldMove_Flash(void) { - if (ShouldDoBrailleFlyEffect()) + // In Ruby and Sapphire, Registeel's tomb is opened by using Fly. In Emerald, + // Flash is used instead. + if (ShouldDoBrailleRegisteelEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = sub_8179918; + gPostMenuFieldCallback = SetUpPuzzleEffectRegisteel; return TRUE; } else if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) |