From aba9a57e148ad550100f0ef827e1b17b0cc92492 Mon Sep 17 00:00:00 2001
From: Heaven Volkoff <vasconcellos.dev@gmail.com>
Date: Sat, 16 May 2020 02:59:29 -0300
Subject: [PATCH] Fix Whomp and PiranhaPlant not appearing from a distance in
 WF

---
 src/game/behaviors/piranha_plant.inc.c | 2 ++
 src/game/behaviors/whomp.inc.c         | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/src/game/behaviors/piranha_plant.inc.c b/src/game/behaviors/piranha_plant.inc.c
index e8abe089..7677e3c9 100644
--- a/src/game/behaviors/piranha_plant.inc.c
+++ b/src/game/behaviors/piranha_plant.inc.c
@@ -329,6 +329,7 @@ void (*TablePiranhaPlantActions[])(void) = {
 void bhv_piranha_plant_loop(void) {
     cur_obj_call_action_function(TablePiranhaPlantActions);
 
+    #ifndef NODRAWINGDISTANCE
     // In WF, hide all Piranha Plants once high enough up.
     if (gCurrLevelNum == LEVEL_WF) {
         if (gMarioObject->oPosY > 3400.0f)
@@ -336,5 +337,6 @@ void bhv_piranha_plant_loop(void) {
         else
             cur_obj_unhide();
     }
+    #endif
     o->oInteractStatus = 0;
 }
diff --git a/src/game/behaviors/whomp.inc.c b/src/game/behaviors/whomp.inc.c
index c9ebca0a..28f1c4c8 100644
--- a/src/game/behaviors/whomp.inc.c
+++ b/src/game/behaviors/whomp.inc.c
@@ -246,10 +246,14 @@ void bhv_whomp_loop(void) {
     cur_obj_call_action_function(sWhompActions);
     cur_obj_move_standard(-20);
     if (o->oAction != 9) {
+        #ifndef NODRAWINGDISTANCE
+        // o->oBehParams2ndByte here seems to be a flag
+        // indicating whether this is a normal or king whomp
         if (o->oBehParams2ndByte != 0)
             cur_obj_hide_if_mario_far_away_y(2000.0f);
         else
             cur_obj_hide_if_mario_far_away_y(1000.0f);
+        #endif
         load_object_collision_model();
     }
 }