From 807996c22511fd6fdd7ec97ba6d290e7e45b4acc Mon Sep 17 00:00:00 2001
From: Agent X <44549182+AgentXLP@users.noreply.github.com>
Date: Fri, 21 Jun 2024 12:32:24 -0400
Subject: [PATCH] Add geo_update_layer_transparency param 30 for not setting
 anim state

---
 src/game/object_helpers.c | 10 +++++++---
 src/pc/network/network.c  |  3 ++-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c
index bb3460ba..09c92bca 100644
--- a/src/game/object_helpers.c
+++ b/src/game/object_helpers.c
@@ -75,7 +75,7 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
     dlStart = NULL;
 
     if (callContext == GEO_CONTEXT_RENDER) {
-        objectGraphNode = (struct Object *) gCurGraphNodeObject; // TODO: change this to object pointer?
+        objectGraphNode = (struct Object *) gCurGraphNodeObject;
         currentGraphNode = (struct GraphNodeGenerated *) node;
         sp2C = (struct GraphNodeGenerated *) node;
 
@@ -98,7 +98,9 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
                 0x100 | (currentGraphNode->fnNode.node.flags & 0xFF);
             }
 
-            objectGraphNode->oAnimState = 0;
+            if (currentGraphNode->parameter != 30) {
+                objectGraphNode->oAnimState = 0;
+            }
         } else {
             if (currentGraphNode->parameter == 20) {
                 currentGraphNode->fnNode.node.flags =
@@ -108,7 +110,9 @@ Gfx *geo_update_layer_transparency(s32 callContext, struct GraphNode *node, UNUS
                 0x500 | (currentGraphNode->fnNode.node.flags & 0xFF);
             }
 
-            objectGraphNode->oAnimState = 1;
+            if (currentGraphNode->parameter != 30) {
+                objectGraphNode->oAnimState = 1;
+            }
 
 #ifdef VERSION_JP
             if (currentGraphNode->parameter == 10) {
diff --git a/src/pc/network/network.c b/src/pc/network/network.c
index 699d275b..860fc1e0 100644
--- a/src/pc/network/network.c
+++ b/src/pc/network/network.c
@@ -30,6 +30,7 @@
 #include "menu/intro_geo.h"
 #include "game/ingame_menu.h"
 #include "game/first_person_cam.h"
+#include "game/envfx_snow.h"
 
 #ifdef DISCORD_SDK
 #include "pc/discord/discord.h"
@@ -679,7 +680,7 @@ void network_shutdown(bool sendLeaving, bool exiting, bool popup, bool reconnect
     gFogColor[2] = 255;
     gFogIntensity = 1;
     gOverrideBackground = -1;
-    gOverrideEnvFx = -1;
+    gOverrideEnvFx = ENVFX_MODE_NO_OVERRIDE;
     gRomhackCameraAllowCentering = TRUE;
     gOverrideAllowToxicGasCamera = FALSE;
     gRomhackCameraAllowDpad = FALSE;