From 0a55a7f40bd8ed14b71e6a8dfbb24da0121d83e4 Mon Sep 17 00:00:00 2001
From: pkmnsnfrn <pkmnsnfrn@gmail.com>
Date: Sun, 11 Aug 2024 17:29:09 -0700
Subject: [PATCH] Combined if statements per
 https://github.com/rh-hideout/pokeemerald-expansion/pull/5044\#discussion_r1712962988

---
 src/field_control_avatar.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 1699a6daa2..584c319595 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -183,18 +183,15 @@ int ProcessPlayerFieldInput(struct FieldInput *input)
             return TRUE;
     }
 
-    if (input->checkStandardWildEncounter)
-    {
-        if (input->dpadDirection == 0 || input->dpadDirection == playerDirection)
-        {
-            GetInFrontOfPlayerPosition(&position);
-            metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
-            if (TrySetUpWalkIntoSignpostScript(&position, metatileBehavior, playerDirection) == TRUE)
-                return TRUE;
-            GetPlayerPosition(&position);
-            metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
-        }
-    }
+	if ((input->checkStandardWildEncounter) && ((input->dpadDirection == 0) || input->dpadDirection == playerDirection))
+	{
+		GetInFrontOfPlayerPosition(&position);
+		metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
+		if (TrySetUpWalkIntoSignpostScript(&position, metatileBehavior, playerDirection) == TRUE)
+			return TRUE;
+		GetPlayerPosition(&position);
+		metatileBehavior = MapGridGetMetatileBehaviorAt(position.x, position.y);
+	}
 
     if (input->checkStandardWildEncounter && CheckStandardWildEncounter(metatileBehavior) == TRUE)
         return TRUE;