Rename gScript* vars to gSpecialVar_*

5 files changed, 15 insertions, 15 deletions

diff --git a/src/battle/battle_controller_player.c b/src/battle/battle_controller_player.c
index 653f0938c..c2d34db0d 100644
--- a/src/battle/battle_controller_player.c
+++ b/src/battle/battle_controller_player.c
@@ -162,7 +162,7 @@ extern u8 gUnknown_0300434C[];
 extern u8 gUnknown_0202E8F4;
 extern u8 gUnknown_0202E8F5;
 extern u8 gUnknown_02038470[];
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern u8 gDisplayedStringBattle[];
 extern const u8 BattleText_LinkStandby[];
 
@@ -1522,7 +1522,7 @@ void sub_802E03C(void)
 {
     if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         PlayerBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_controller_safari.c b/src/battle/battle_controller_safari.c
index 3dcfca948..6f6286945 100644
--- a/src/battle/battle_controller_safari.c
+++ b/src/battle/battle_controller_safari.c
@@ -31,7 +31,7 @@ extern u8 gObjectBankIDs[];
 extern struct SpriteTemplate gUnknown_02024E8C;
 extern u16 gBattleTypeFlags;
 extern u32 gBattleExecBuffer;
-extern u16 gScriptItemId;
+extern u16 gSpecialVar_ItemId;
 extern MainCallback gPreBattleCallback1;
 extern u8 gBankInMenu;
 extern u8 gHealthboxIDs[];
@@ -315,7 +315,7 @@ void sub_812B758(void)
 {
     if (gMain.callback2 == sub_800F808 && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         SafariBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_controller_wally.c b/src/battle/battle_controller_wally.c
index 0d698d9a5..d81c43381 100644
--- a/src/battle/battle_controller_wally.c
+++ b/src/battle/battle_controller_wally.c
@@ -367,7 +367,7 @@ void sub_81374FC(void)
     if (gMain.callback2 == sub_800F808
      && !gPaletteFade.active)
     {
-        Emitcmd35(1, gScriptItemId);
+        Emitcmd35(1, gSpecialVar_ItemId);
         WallyBufferExecCompleted();
     }
 }
diff --git a/src/battle/battle_party_menu.c b/src/battle/battle_party_menu.c
index 5decf8a7b..d4dcae0ca 100644
--- a/src/battle/battle_party_menu.c
+++ b/src/battle/battle_party_menu.c
@@ -426,7 +426,7 @@ bool8 SetUpBattlePartyMenu(void)
     case 10:
         if (gUnknown_02038473 == 3)
         {
-            if (GetItemEffectType(gScriptItemId) == 10)
+            if (GetItemEffectType(gSpecialVar_ItemId) == 10)
                 ewram1B000.promptTextId = 0xFF;
             else
                 ewram1B000.promptTextId = 3;
@@ -464,9 +464,9 @@ void HandleBattlePartyMenu(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
-        if (gUnknown_02038473 == 3 && GetItemEffectType(gScriptItemId) == 10)
+        if (gUnknown_02038473 == 3 && GetItemEffectType(gSpecialVar_ItemId) == 10)
         {
-            gUnknown_03004AE4(taskId, gScriptItemId, Task_80952E4);
+            gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4);
             return;
         }
 
@@ -480,7 +480,7 @@ void HandleBattlePartyMenu(u8 taskId)
                 else
                 {
                     sub_806D5A4();
-                    gUnknown_03004AE4(taskId, gScriptItemId, Task_80952E4);
+                    gUnknown_03004AE4(taskId, gSpecialVar_ItemId, Task_80952E4);
                 }
             }
             else
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index 6baf47dee..f71aad090 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -33,7 +33,7 @@
 #include "text.h"
 #include "trainer.h"
 
-extern u16 gScriptResult;
+extern u16 gSpecialVar_Result;
 
 extern void (*gFieldCallback)(void);
 
@@ -48,7 +48,7 @@ EWRAM_DATA static u8 *sTrainerBattleScriptRetAddr = NULL;
 EWRAM_DATA static u8 *sTrainerBattleEndScript = NULL;
 
 extern u16 gBattleTypeFlags;
-extern u16 gScriptLastTalked;
+extern u16 gSpecialVar_LastTalked;
 extern u8 gBattleOutcome;
 
 extern struct MapObject gMapObjects[];
@@ -858,8 +858,8 @@ static void CB2_GiveStarter(void)
 {
     u16 starterPoke;
 
-    *GetVarPointer(0x4023) = gScriptResult;
-    starterPoke = GetStarterPokemon(gScriptResult);
+    *GetVarPointer(0x4023) = gSpecialVar_Result;
+    starterPoke = GetStarterPokemon(gSpecialVar_Result);
     ScriptGiveMon(starterPoke, 5, 0, 0, 0, 0);
     ResetTasks();
     sub_80408BC();
@@ -980,7 +980,7 @@ static void battle_80801F0(void)
 {
     if (sTrainerMapObjectLocalId)
     {
-        gScriptLastTalked = sTrainerMapObjectLocalId;
+        gSpecialVar_LastTalked = sTrainerMapObjectLocalId;
         gSelectedMapObject = GetFieldObjectIdByLocalIdAndMap(sTrainerMapObjectLocalId, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup);
     }
 }
@@ -1029,7 +1029,7 @@ u8 *BattleSetup_ConfigureTrainerBattle(const u8 *data)
 void TrainerWantsBattle(u8 trainerMapObjId, u8 *trainerScript)
 {
     gSelectedMapObject = trainerMapObjId;
-    gScriptLastTalked = gMapObjects[trainerMapObjId].localId;
+    gSpecialVar_LastTalked = gMapObjects[trainerMapObjId].localId;
     BattleSetup_ConfigureTrainerBattle(trainerScript + 1);
     ScriptContext1_SetupScript(gUnknown_0819F80B);
     ScriptContext2_Enable();