diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-21 11:59:37 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-21 11:59:37 -0600 |
| commit | 85a8e5f1ded5a0a2354916617dd0b82091a42ee0 (patch) | |
| tree | 9d04e3c1d115d496af910f2a1714e6e3fe82d77b /src/field/fldeff_strength.c | |
| parent | 871ae4c283ec8bc7730df52790b5ca53baa82230 (diff) | |
| parent | 19895d28322609e6f67797bfec9851e0cb5a2182 (diff) | |
Merge pull request #497 from huderlem/script_commands
Port event script names from pokeemerald
Diffstat (limited to 'src/field/fldeff_strength.c')
| -rw-r--r-- | src/field/fldeff_strength.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/fldeff_strength.c b/src/field/fldeff_strength.c index d9603d094..565ac1651 100644 --- a/src/field/fldeff_strength.c +++ b/src/field/fldeff_strength.c @@ -14,7 +14,7 @@ static void sub_811AA38(void); static void sub_811AA9C(void); extern u8 gLastFieldPokeMenuOpened; -extern u16 gScriptResult; +extern u16 gSpecialVar_Result; extern void (*gFieldCallback)(void); extern void (*gUnknown_03005CE4)(void); @@ -24,7 +24,7 @@ bool8 SetUpFieldMove_Strength(void) { if (ShouldDoBrailleStrengthEffect()) { - gScriptResult = gLastFieldPokeMenuOpened; + gSpecialVar_Result = gLastFieldPokeMenuOpened; gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_811AA38; } @@ -32,7 +32,7 @@ bool8 SetUpFieldMove_Strength(void) { if (npc_before_player_of_type(87) != TRUE) return 0; - gScriptResult = gLastFieldPokeMenuOpened; + gSpecialVar_Result = gLastFieldPokeMenuOpened; gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_811AA18; } |