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_strength.c | |
| parent | aecddc277130652a90e00ad0cc314b7ef9765bbb (diff) | |
| parent | c1c2015f7046676b043641c0d1f9d9e29bc73647 (diff) | |
Merge branch 'master' into field_effect_helpers
Diffstat (limited to 'src/fldeff_strength.c')
| -rw-r--r-- | src/fldeff_strength.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c index c641945d6..d9603d094 100644 --- a/src/fldeff_strength.c +++ b/src/fldeff_strength.c @@ -18,14 +18,14 @@ extern u16 gScriptResult; extern void (*gFieldCallback)(void); extern void (*gUnknown_03005CE4)(void); -extern u8 UseStrengthScript[]; +extern u8 S_UseStrength[]; bool8 SetUpFieldMove_Strength(void) { if (ShouldDoBrailleStrengthEffect()) { gScriptResult = gLastFieldPokeMenuOpened; - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_811AA38; } else @@ -33,7 +33,7 @@ bool8 SetUpFieldMove_Strength(void) if (npc_before_player_of_type(87) != TRUE) return 0; gScriptResult = gLastFieldPokeMenuOpened; - gFieldCallback = sub_808AB90; + gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_811AA18; } @@ -43,13 +43,13 @@ bool8 SetUpFieldMove_Strength(void) static void sub_811AA18(void) { gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; - ScriptContext1_SetupScript(UseStrengthScript); + ScriptContext1_SetupScript(S_UseStrength); } static void sub_811AA38(void) { gFieldEffectArguments[0] = gLastFieldPokeMenuOpened; - FieldEffectStart(40); + FieldEffectStart(FLDEFF_USE_STRENGTH); } bool8 FldEff_UseStrength(void) |