Merge branch 'master' into slot_machine

1 files changed, 4 insertions, 4 deletions

diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c
index cc4468728..4bf83cad8 100644
--- a/src/field/wild_encounter.c
+++ b/src/field/wild_encounter.c
@@ -3695,7 +3695,7 @@ const u16 gRoute119WaterTileData[] =
 	0x5C, 0x8B, 0x12A,
 };
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 extern u8 S_RepelWoreOff[];
 
 EWRAM_DATA static u8 sWildEncountersDisabled = 0;
@@ -4167,18 +4167,18 @@ void ScrSpecial_RockSmashWildEncounter(void)
 
         if (wildPokemonInfo == NULL)
         {
-            gScriptResult = 0;
+            gSpecialVar_Result = 0;
             return;
         }
         else if (DoWildEncounterTest(wildPokemonInfo->encounterRate, 1) == TRUE
          && GenerateWildMon(wildPokemonInfo, 2, TRUE) == TRUE)
         {
             BattleSetup_StartWildBattle();
-            gScriptResult = 1;
+            gSpecialVar_Result = 1;
             return;
         }
     }
-    gScriptResult = 0;
+    gSpecialVar_Result = 0;
     return;
 }