diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-02-18 13:23:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-18 13:23:19 -0600 |
| commit | 924cbe9ee4f4fded710bdb77014f6de48e461f77 (patch) | |
| tree | 6a3da8a78c3c1d3804e403a3b4e68a387cf09762 /src/fldeff_rocksmash.c | |
| parent | 047d8288cc742e98701c2bee512797c89def7bec (diff) | |
| parent | 486cf449b8d5715d4ba7d5f1144ab9b8288dd3ee (diff) | |
Merge pull request #560 from Phlosioneer/regi-documentation
Document the regi* code more
Diffstat (limited to 'src/fldeff_rocksmash.c')
| -rw-r--r-- | src/fldeff_rocksmash.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c index 9181b5532..86df8e943 100644 --- a/src/fldeff_rocksmash.c +++ b/src/fldeff_rocksmash.c @@ -119,11 +119,13 @@ static void sub_813561C(u8 taskId) bool8 SetUpFieldMove_RockSmash(void) { - if (ShouldDoBrailleStrengthEffect()) + // In Ruby and Sapphire, Regirock's tomb is opened by using Strength. In Emerald, + // it is opened by using Rock Smash. + if (ShouldDoBrailleRegirockEffect()) { gSpecialVar_Result = GetCursorSelectionMonId(); gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu; - gPostMenuFieldCallback = sub_8179834; + gPostMenuFieldCallback = SetUpPuzzleEffectRegirock; return TRUE; } else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE) |