From 4e07c4350064dde08ab09681312ceffd5c1f35ce Mon Sep 17 00:00:00 2001
From: Arceveti <73617174+Arceveti@users.noreply.github.com>
Date: Sat, 20 Nov 2021 17:02:35 -0800
Subject: [PATCH] Simplify silhouette f3d

---
 src/game/mario.c                |  2 +-
 src/game/rendering_graph_node.c | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/game/mario.c b/src/game/mario.c
index 931a27b9a..14f521733 100644
--- a/src/game/mario.c
+++ b/src/game/mario.c
@@ -1712,7 +1712,7 @@ s32 execute_mario_action(struct MarioState *m) {
 #ifdef PUPPYCAM
         if (!(gPuppyCam.flags & PUPPYCAM_BEHAVIOUR_FREE)) {
 #endif
-            mario_handle_special_floors(m);  
+            mario_handle_special_floors(m);
 #ifdef PUPPYCAM
         }
 #endif
diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c
index 82341fa4e..ef89e6415 100644
--- a/src/game/rendering_graph_node.c
+++ b/src/game/rendering_graph_node.c
@@ -190,16 +190,15 @@ const Gfx dl_silhouette_begin[] = {
     gsDPPipeSync(),
     gsDPSetRenderMode((SCHWA | GBL_c1(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1MA)),
                       (SCHWA | GBL_c2(G_BL_CLR_FOG, G_BL_A_FOG, G_BL_CLR_MEM, G_BL_1MA))),
-    gsSPSetGeometryMode(G_FOG),                  /* Enable fog                  */
-    gsSPFogPosition(0, 1),                       /* Fox position                */
-    gsDPSetFogColor(0, 0, 0, SILHOUETTE       ), /* silhouette color & alpha    */
-    gsDPSetEnvColor(0, 0, 0, SIL_CVG_THRESHOLD), /* silhouette env transparency */
+    gsDPSetFogColor(0, 0, 0, SILHOUETTE       ), /* Silhouette color & alpha    */
+    gsDPSetEnvColor(0, 0, 0, SIL_CVG_THRESHOLD), /* Silhouette env transparency */
     gsSPEndDisplayList(),
 };
+
 const Gfx dl_silhouette_end[] = {
     gsDPPipeSync(),
-    gsSPClearGeometryMode(G_FOG),                /* Disable fog                 */
-    gsDPSetEnvColor(255, 255, 255, 255),         /* Reset env color & alpha     */
+    gsDPSetFogColor(  0,   0,   0, 255), /* Reset fog color & alpha */
+    gsDPSetEnvColor(255, 255, 255, 255), /* Reset env color & alpha */
     gsSPEndDisplayList(),
 };
 #endif