From 52da4e921936725147ad874aeea7d879416ae6d4 Mon Sep 17 00:00:00 2001
From: RavePossum <ravepossum@proton.me>
Date: Mon, 24 Jun 2024 19:02:10 -0400
Subject: [PATCH] Rename function that was named incorrectly,
 TryGetVarPointer->TryGetVar

---
 include/inlines.h             |  2 +-
 include/unk_0203E880.h        |  2 +-
 src/overlay005/ov5_021F77A8.c |  2 +-
 src/unk_0203C954.c            |  2 +-
 src/unk_0203E880.c            | 12 ++++++------
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/include/inlines.h b/include/inlines.h
index f18d514cc9..d0ed8c848b 100644
--- a/include/inlines.h
+++ b/include/inlines.h
@@ -166,7 +166,7 @@ static inline u16 * ScriptContext_GetVarPointer (ScriptContext * ctx)
 
 static inline u16 ScriptContext_GetVar (ScriptContext * ctx)
 {
-    return FieldSystem_TryGetVarPointer(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx));
+    return FieldSystem_TryGetVar(ctx->fieldSystem, ScriptContext_ReadHalfWord(ctx));
 }
 
 static inline void inline_0204E650 (VarsFlags * param0)
diff --git a/include/unk_0203E880.h b/include/unk_0203E880.h
index 4f63c28aca..27d8f6d658 100644
--- a/include/unk_0203E880.h
+++ b/include/unk_0203E880.h
@@ -140,7 +140,7 @@ void * ScriptManager_GetMemberPtr(ScriptManager * scriptManager, u32 member);
 void * FieldSystem_GetScriptMember(FieldSystem * fieldSystem, u32 member);
 void sub_0203F0C0(FieldSystem * fieldSystem);
 u16 * FieldSystem_GetVarPointer(FieldSystem * fieldSystem, u16 varID);
-u16 FieldSystem_TryGetVarPointer(FieldSystem * fieldSystem, u16 varID);
+u16 FieldSystem_TryGetVar(FieldSystem * fieldSystem, u16 varID);
 u16 sub_0203F164(FieldSystem * fieldSystem, u16 param1);
 BOOL FieldSystem_CheckFlag(FieldSystem * fieldSystem, u16 flagID);
 void FieldSystem_SetFlag(FieldSystem * fieldSystem, u16 flagID);
diff --git a/src/overlay005/ov5_021F77A8.c b/src/overlay005/ov5_021F77A8.c
index 2a445bfe92..8fed90b722 100644
--- a/src/overlay005/ov5_021F77A8.c
+++ b/src/overlay005/ov5_021F77A8.c
@@ -95,7 +95,7 @@ static void ov5_021F8250(UnkStruct_ov5_021F7ED8 * param0);
 
 BOOL ScrCmd_337 (ScriptContext * param0)
 {
-    u16 v0 = FieldSystem_TryGetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0));
+    u16 v0 = FieldSystem_TryGetVar(param0->fieldSystem, ScriptContext_ReadHalfWord(param0));
     u16 * v1 = FieldSystem_GetVarPointer(param0->fieldSystem, ScriptContext_ReadHalfWord(param0));
     PokedexData * v2 = SaveData_Pokedex(param0->fieldSystem->saveData);
 
diff --git a/src/unk_0203C954.c b/src/unk_0203C954.c
index 656f8302b5..c235bc095b 100644
--- a/src/unk_0203C954.c
+++ b/src/unk_0203C954.c
@@ -212,7 +212,7 @@ u16 sub_0203CC14 (FieldSystem * fieldSystem, void * param1, int param2)
     int v2 = Player_GetZPos(fieldSystem->playerAvatar);
 
     for (v3 = 0; v3 < param2; v3++) {
-        if ((v1 >= v0[v3].x) && (v1 < (v0[v3].x + v0[v3].width)) && (v2 >= v0[v3].z) && (v2 < (v0[v3].z + v0[v3].length)) && (FieldSystem_TryGetVarPointer(fieldSystem, v0[v3].var) == v0[v3].value)) {
+        if ((v1 >= v0[v3].x) && (v1 < (v0[v3].x + v0[v3].width)) && (v2 >= v0[v3].z) && (v2 < (v0[v3].z + v0[v3].length)) && (FieldSystem_TryGetVar(fieldSystem, v0[v3].var) == v0[v3].value)) {
             return v0[v3].script;
         }
     }
diff --git a/src/unk_0203E880.c b/src/unk_0203E880.c
index b100b92be2..83ca95b6f3 100644
--- a/src/unk_0203E880.c
+++ b/src/unk_0203E880.c
@@ -486,21 +486,21 @@ u16 * FieldSystem_GetVarPointer (FieldSystem * fieldSystem, u16 varID)
     return FieldSystem_GetScriptMember(fieldSystem, SCRIPT_DATA_START + varID - SPECIAL_VARS_START);
 }
 
-u16 FieldSystem_TryGetVarPointer (FieldSystem * fieldSystem, u16 varID)
+u16 FieldSystem_TryGetVar (FieldSystem * fieldSystem, u16 varID)
 {
-    u16 *varPtr = FieldSystem_GetVarPointer(fieldSystem, varID);
+    u16 *var = FieldSystem_GetVarPointer(fieldSystem, varID);
 
-    if (varPtr == NULL) {
+    if (var == NULL) {
         return varID;
     }
 
-    return *varPtr;
+    return *var;
 }
 
 u16 sub_0203F164 (FieldSystem * fieldSystem, u16 varID)
 {
     GF_ASSERT(varID < 16);
-    return FieldSystem_TryGetVarPointer(fieldSystem, (((0 + VARS_START) + 32) + varID));
+    return FieldSystem_TryGetVar(fieldSystem, (((0 + VARS_START) + 32) + varID));
 }
 
 BOOL FieldSystem_CheckFlag (FieldSystem * fieldSystem, u16 flagID)
@@ -837,7 +837,7 @@ static u16 sub_0203F638 (FieldSystem * fieldSystem, const u8 * param1, u8 param2
         v1 = (*param1 + (*(param1 + 1) << 8));
         param1 += 2;
 
-        if (FieldSystem_TryGetVarPointer(fieldSystem, v0) == FieldSystem_TryGetVarPointer(fieldSystem, v1)) {
+        if (FieldSystem_TryGetVar(fieldSystem, v0) == FieldSystem_TryGetVar(fieldSystem, v1)) {
             return *param1 + (*(param1 + 1) << 8);
         }