From eb22894ca78ef91ec468b59e7d4904f5c88e64b1 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Fri, 18 Feb 2022 18:48:43 -0800
Subject: [PATCH] Revert "Fixed rendering of metal Toad's held objects"

This reverts commit efcf78dee14c187c304afc1ed110ef2a1997ee29.
---
 actors/toad_player/geo.inc.c    | 10 ----------
 actors/toad_player/geo_header.h |  1 -
 2 files changed, 11 deletions(-)

diff --git a/actors/toad_player/geo.inc.c b/actors/toad_player/geo.inc.c
index 9b520240..943a8f0c 100644
--- a/actors/toad_player/geo.inc.c
+++ b/actors/toad_player/geo.inc.c
@@ -84,9 +84,7 @@ const GeoLayout toad_player_geo_face_and_wings[] = {
 const GeoLayout toad_player_geo_right_hand[] = {
    GEO_TRANSLATE(LAYER_OPAQUE, 100, 0, 0),
    GEO_OPEN_NODE(),
-      GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
       GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
-      GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_start),
    GEO_CLOSE_NODE(),
 
    GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@@ -305,9 +303,7 @@ const GeoLayout toad_player_geo_vanish_face_and_wings[] = {
 const GeoLayout toad_player_geo_vanish_right_hand[] = {
    GEO_TRANSLATE(LAYER_TRANSPARENT, 100, 0, 0),
    GEO_OPEN_NODE(),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
       GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_start),
    GEO_CLOSE_NODE(),
 
    GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@@ -511,9 +507,7 @@ const GeoLayout toad_player_geo_metal_face_and_wings[] = {
 const GeoLayout toad_player_geo_metal_right_hand[] = {
    GEO_TRANSLATE(LAYER_OPAQUE, 100, 0, 0),
    GEO_OPEN_NODE(),
-      GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
       GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
-      GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_start),
    GEO_CLOSE_NODE(),
 
    GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@@ -639,7 +633,6 @@ const GeoLayout toad_player_geo_metal_body[] = {
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
-      GEO_DISPLAY_LIST(LAYER_OPAQUE, toad_player_metal_stop),
    GEO_CLOSE_NODE(),
    GEO_RETURN(),
 };
@@ -718,9 +711,7 @@ const GeoLayout toad_player_geo_metal_vanish_face_and_wings[] = {
 const GeoLayout toad_player_geo_metal_vanish_right_hand[] = {
    GEO_TRANSLATE(LAYER_TRANSPARENT, 100, 0, 0),
    GEO_OPEN_NODE(),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
       GEO_HELD_OBJECT(0x00, 0, 0, 0, geo_switch_mario_hand_grab_pos),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_start),
    GEO_CLOSE_NODE(),
 
    GEO_SWITCH_CASE(0, geo_switch_mario_hand),
@@ -846,7 +837,6 @@ const GeoLayout toad_player_geo_metal_vanish_body[] = {
             GEO_CLOSE_NODE(),
          GEO_CLOSE_NODE(),
       GEO_CLOSE_NODE(),
-      GEO_DISPLAY_LIST(LAYER_TRANSPARENT, toad_player_metal_stop),
    GEO_CLOSE_NODE(),
    GEO_RETURN(),
 };
diff --git a/actors/toad_player/geo_header.h b/actors/toad_player/geo_header.h
index b7c1cd6b..24547dab 100644
--- a/actors/toad_player/geo_header.h
+++ b/actors/toad_player/geo_header.h
@@ -1,5 +1,4 @@
 extern const Gfx toad_player_metal_start[];
-extern const Gfx toad_player_metal_stop[];
 
 extern const Gfx toad_player_dl_face[];
 extern const Gfx toad_player_dl_eyes_closed[];