From c98a263cf40520bf0d131eb2d1a2f90240787c98 Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Tue, 12 May 2020 09:26:16 +0200
Subject: [PATCH 1/7] adding option to disable draw distance

---
 Makefile                                   | 8 ++++++++
 src/engine/behavior_script.c               | 4 ++++
 src/engine/surface_load.c                  | 4 ++++
 src/game/behaviors/butterfly.inc.c         | 3 ++-
 src/game/behaviors/chain_chomp.inc.c       | 8 ++++++++
 src/game/behaviors/coin.inc.c              | 6 ++++++
 src/game/behaviors/fish.inc.c              | 4 ++++
 src/game/behaviors/goomba.inc.c            | 4 ++++
 src/game/behaviors/heave_ho.inc.c          | 4 ++++
 src/game/behaviors/king_bobomb.inc.c       | 4 ++++
 src/game/behaviors/pokey.inc.c             | 6 ++++++
 src/game/behaviors/snufit.inc.c            | 4 ++++
 src/game/behaviors/triplet_butterfly.inc.c | 4 ++++
 src/game/behaviors/water_bomb_cannon.inc.c | 8 ++++++++
 src/game/behaviors/whirlpool.inc.c         | 4 ++++
 15 files changed, 74 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index d4bd284..efeb63e 100644
--- a/Makefile
+++ b/Makefile
@@ -27,6 +27,8 @@ COMPILER ?= ido
 
 # Disable better camera by default
 BETTERCAMERA ?= 0
+# Disable no drawing distance by default
+NODRAWINGDISTANCE ?= 0
 
 # Build for Emscripten/WebGL
 TARGET_WEB ?= 0
@@ -449,6 +451,12 @@ CC_CHECK += -DBETTERCAMERA
 CFLAGS += -DBETTERCAMERA
 endif
 
+# Check for no drawing distance option
+ifeq ($(NODRAWINGDISTANCE),1)
+CC_CHECK += -DNODRAWINGDISTANCE
+CFLAGS += -DNODRAWINGDISTANCE
+endif
+
 ASFLAGS := -I include -I $(BUILD_DIR) $(VERSION_ASFLAGS)
 
 ifeq ($(TARGET_WEB),1)
diff --git a/src/engine/behavior_script.c b/src/engine/behavior_script.c
index edd5247..feb6fef 100644
--- a/src/engine/behavior_script.c
+++ b/src/engine/behavior_script.c
@@ -987,11 +987,15 @@ void cur_obj_update(void) {
     } else if ((objFlags & OBJ_FLAG_COMPUTE_DIST_TO_MARIO) && gCurrentObject->collisionData == NULL) {
         if (!(objFlags & OBJ_FLAG_ACTIVE_FROM_AFAR)) {
             // If the object has a render distance, check if it should be shown.
+#ifndef NODRAWINGDISTANCE
             if (distanceFromMario > gCurrentObject->oDrawingDistance) {
                 // Out of render distance, hide the object.
                 gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
                 gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY;
             } else if (gCurrentObject->oHeldState == HELD_FREE) {
+#else
+            if (distanceFromMario <= gCurrentObject->oDrawingDistance && gCurrentObject->oHeldState == HELD_FREE) {
+#endif
                 // In render distance (and not being held), show the object.
                 gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
                 gCurrentObject->activeFlags &= ~ACTIVE_FLAG_FAR_AWAY;
diff --git a/src/engine/surface_load.c b/src/engine/surface_load.c
index 363f9af..498fae0 100644
--- a/src/engine/surface_load.c
+++ b/src/engine/surface_load.c
@@ -789,9 +789,13 @@ void load_object_collision_model(void) {
         }
     }
 
+#ifndef NODRAWINGDISTANCE
     if (marioDist < gCurrentObject->oDrawingDistance) {
+#endif
         gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
+#ifndef NODRAWINGDISTANCE
     } else {
         gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
     }
+#endif
 }
diff --git a/src/game/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c
index d435d8d..9296ed5 100644
--- a/src/game/behaviors/butterfly.inc.c
+++ b/src/game/behaviors/butterfly.inc.c
@@ -107,6 +107,7 @@ void bhv_butterfly_loop(void) {
             butterfly_act_return_home();
             break;
     }
-
+#ifndef NODRAWINGDISTANCE
     set_object_visibility(o, 3000);
+#endif
 }
diff --git a/src/game/behaviors/chain_chomp.inc.c b/src/game/behaviors/chain_chomp.inc.c
index a77c5d5..9b9c342 100644
--- a/src/game/behaviors/chain_chomp.inc.c
+++ b/src/game/behaviors/chain_chomp.inc.c
@@ -53,7 +53,9 @@ static void chain_chomp_act_uninitialized(void) {
     struct ChainSegment *segments;
     s32 i;
 
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 3000.0f) {
+#endif
         segments = mem_pool_alloc(gObjectMemoryPool, 5 * sizeof(struct ChainSegment));
         if (segments != NULL) {
             // Each segment represents the offset of a chain part to the pivot.
@@ -81,7 +83,9 @@ static void chain_chomp_act_uninitialized(void) {
                 cur_obj_unhide();
             }
         }
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**
@@ -359,10 +363,12 @@ static void chain_chomp_act_move(void) {
     f32 maxDistToPivot;
 
     // Unload chain if mario is far enough
+#ifndef NODRAWINGDISTANCE
     if (o->oChainChompReleaseStatus == CHAIN_CHOMP_NOT_RELEASED && o->oDistanceToMario > 4000.0f) {
         o->oAction = CHAIN_CHOMP_ACT_UNLOAD_CHAIN;
         o->oForwardVel = o->oVelY = 0.0f;
     } else {
+#endif
         cur_obj_update_floor_and_walls();
 
         switch (o->oChainChompReleaseStatus) {
@@ -446,7 +452,9 @@ static void chain_chomp_act_move(void) {
             o->oGravity = -4.0f;
             o->oChainChompTargetPitch = -0x3000;
         }
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**
diff --git a/src/game/behaviors/coin.inc.c b/src/game/behaviors/coin.inc.c
index 913c583..05619b9 100644
--- a/src/game/behaviors/coin.inc.c
+++ b/src/game/behaviors/coin.inc.c
@@ -184,17 +184,23 @@ void bhv_coin_formation_loop(void) {
     s32 bitIndex;
     switch (o->oAction) {
         case 0:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario < 2000.0f) {
+#endif
                 for (bitIndex = 0; bitIndex < 8; bitIndex++) {
                     if (!(o->oCoinUnkF4 & (1 << bitIndex)))
                         spawn_coin_in_formation(bitIndex, o->oBehParams2ndByte);
                 }
                 o->oAction++;
+#ifndef NODRAWINGDISTANCE
             }
+#endif
             break;
         case 1:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario > 2100.0f)
                 o->oAction++;
+#endif
             break;
         case 2:
             o->oAction = 0;
diff --git a/src/game/behaviors/fish.inc.c b/src/game/behaviors/fish.inc.c
index 839ab8d..f652ef4 100644
--- a/src/game/behaviors/fish.inc.c
+++ b/src/game/behaviors/fish.inc.c
@@ -42,7 +42,9 @@ void fish_act_spawn(void) {
      * If the current level is Secret Aquarium, ignore this requirement.
      * Fish moves at random with a max-range of 700.0f.
      */
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < minDistToMario || gCurrLevelNum == LEVEL_SA) {
+#endif
         for (i = 0; i < schoolQuantity; i++) {
             fishObject = spawn_object(o, model, bhvFish);
             fishObject->oBehParams2ndByte = o->oBehParams2ndByte;
@@ -50,7 +52,9 @@ void fish_act_spawn(void) {
             obj_translate_xyz_random(fishObject, 700.0f);
         }
         o->oAction = FISH_ACT_ACTIVE;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**
diff --git a/src/game/behaviors/goomba.inc.c b/src/game/behaviors/goomba.inc.c
index 2dab2fe..bf47dda 100644
--- a/src/game/behaviors/goomba.inc.c
+++ b/src/game/behaviors/goomba.inc.c
@@ -78,7 +78,9 @@ void bhv_goomba_triplet_spawner_update(void) {
     // If mario is close enough and the goombas aren't currently loaded, then
     // spawn them
     if (o->oAction == GOOMBA_TRIPLET_SPAWNER_ACT_UNLOADED) {
+#ifndef NODRAWINGDISTANCE
         if (o->oDistanceToMario < 3000.0f) {
+#endif
             // The spawner is capable of spawning more than 3 goombas, but this
             // is not used in the game
             dAngle =
@@ -98,11 +100,13 @@ void bhv_goomba_triplet_spawner_update(void) {
             }
 
             o->oAction += 1;
+#ifndef NODRAWINGDISTANCE
         }
     } else if (o->oDistanceToMario > 4000.0f) {
         // If mario is too far away, enter the unloaded action. The goombas
         // will detect this and unload themselves
         o->oAction = GOOMBA_TRIPLET_SPAWNER_ACT_UNLOADED;
+#endif
     }
 }
 
diff --git a/src/game/behaviors/heave_ho.inc.c b/src/game/behaviors/heave_ho.inc.c
index 662bb0b..2f9da86 100644
--- a/src/game/behaviors/heave_ho.inc.c
+++ b/src/game/behaviors/heave_ho.inc.c
@@ -73,14 +73,18 @@ void heave_ho_act_3(void) {
 
 void heave_ho_act_0(void) {
     cur_obj_set_pos_to_home();
+#ifndef NODRAWINGDISTANCE
     if (find_water_level(o->oPosX, o->oPosZ) < o->oPosY && o->oDistanceToMario < 4000.0f) {
+#endif
         cur_obj_become_tangible();
         cur_obj_unhide();
         o->oAction = 1;
+#ifndef NODRAWINGDISTANCE
     } else {
         cur_obj_become_intangible();
         cur_obj_hide();
     }
+#endif
 }
 
 void (*sHeaveHoActions[])(void) = { heave_ho_act_0, heave_ho_act_1, heave_ho_act_2, heave_ho_act_3 };
diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c
index 63a7575..af1cb0a 100644
--- a/src/game/behaviors/king_bobomb.inc.c
+++ b/src/game/behaviors/king_bobomb.inc.c
@@ -295,10 +295,14 @@ void king_bobomb_move(void) {
         cur_obj_move_using_fvel_and_gravity();
     cur_obj_call_action_function(sKingBobombActions);
     exec_anim_sound_state(sKingBobombSoundStates);
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 5000.0f)
+#endif
         cur_obj_enable_rendering();
+#ifndef NODRAWINGDISTANCE
     else
         cur_obj_disable_rendering();
+#endif
 }
 
 void bhv_king_bobomb_loop(void) {
diff --git a/src/game/behaviors/pokey.inc.c b/src/game/behaviors/pokey.inc.c
index df5d11f..cfcc92c 100644
--- a/src/game/behaviors/pokey.inc.c
+++ b/src/game/behaviors/pokey.inc.c
@@ -151,7 +151,9 @@ static void pokey_act_uninitialized(void) {
     s32 i;
     s16 partModel;
 
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 2000.0f) {
+#endif
         partModel = MODEL_POKEY_HEAD;
 
         for (i = 0; i < 5; i++) {
@@ -170,7 +172,9 @@ static void pokey_act_uninitialized(void) {
         o->oPokeyNumAliveBodyParts = 5;
         o->oPokeyBottomBodyPartSize = 1.0f;
         o->oAction = POKEY_ACT_WANDER;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**
@@ -185,9 +189,11 @@ static void pokey_act_wander(void) {
 
     if (o->oPokeyNumAliveBodyParts == 0) {
         obj_mark_for_deletion(o);
+#ifndef NODRAWINGDISTANCE
     } else if (o->oDistanceToMario > 2500.0f) {
         o->oAction = POKEY_ACT_UNLOAD_PARTS;
         o->oForwardVel = 0.0f;
+#endif
     } else {
         treat_far_home_as_mario(1000.0f);
         cur_obj_update_floor_and_walls();
diff --git a/src/game/behaviors/snufit.inc.c b/src/game/behaviors/snufit.inc.c
index f3a0c9e..76e78c0 100644
--- a/src/game/behaviors/snufit.inc.c
+++ b/src/game/behaviors/snufit.inc.c
@@ -180,7 +180,11 @@ void bhv_snufit_loop(void) {
 void bhv_snufit_balls_loop(void) {
     // If far from Mario or in a different room, despawn.
     if ((o->activeFlags & ACTIVE_FLAG_IN_DIFFERENT_ROOM)
+#ifndef NODRAWINGDISTANCE
         || (o->oTimer != 0 && o->oDistanceToMario > 1500.0f)) {
+#else
+        || (o->oTimer != 0)) {
+#endif
         obj_mark_for_deletion(o);
     }
 
diff --git a/src/game/behaviors/triplet_butterfly.inc.c b/src/game/behaviors/triplet_butterfly.inc.c
index 1c2b926..3d16a9d 100644
--- a/src/game/behaviors/triplet_butterfly.inc.c
+++ b/src/game/behaviors/triplet_butterfly.inc.c
@@ -54,9 +54,11 @@ static void triplet_butterfly_act_init(void) {
 }
 
 static void triplet_butterfly_act_wander(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario > 1500.0f) {
         obj_mark_for_deletion(o);
     } else {
+#endif
         approach_f32_ptr(&o->oTripletButterflySpeed, 8.0f, 0.5f);
         if (o->oTimer < 60) {
             o->oTripletButterflyTargetYaw = cur_obj_angle_to_home();
@@ -82,7 +84,9 @@ static void triplet_butterfly_act_wander(void) {
 
         obj_move_pitch_approach(o->oTripletButterflyTargetPitch, 400);
         cur_obj_rotate_yaw_toward(o->oTripletButterflyTargetYaw, random_linear_offset(400, 800));
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 static void triplet_butterfly_act_activate(void) {
diff --git a/src/game/behaviors/water_bomb_cannon.inc.c b/src/game/behaviors/water_bomb_cannon.inc.c
index 8e9ba33..fb82e43 100644
--- a/src/game/behaviors/water_bomb_cannon.inc.c
+++ b/src/game/behaviors/water_bomb_cannon.inc.c
@@ -38,19 +38,27 @@ void bhv_bubble_cannon_barrel_loop(void) {
 }
 
 void water_bomb_cannon_act_0(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 2000.0f) {
+#endif
         spawn_object(o, MODEL_CANNON_BARREL, bhvCannonBarrelBubbles);
         cur_obj_unhide();
 
         o->oAction = 1;
         o->oMoveAnglePitch = o->oWaterCannonUnkFC = 0x1C00;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 void water_bomb_cannon_act_1(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario > 2500.0f) {
         o->oAction = 2;
     } else if (o->oBehParams2ndByte == 0) {
+#else
+    if (o->oBehParams2ndByte == 0) {
+#endif
         if (o->oWaterCannonUnkF4 != 0) {
             o->oWaterCannonUnkF4 -= 1;
         } else {
diff --git a/src/game/behaviors/whirlpool.inc.c b/src/game/behaviors/whirlpool.inc.c
index 405e051..5aebebd 100644
--- a/src/game/behaviors/whirlpool.inc.c
+++ b/src/game/behaviors/whirlpool.inc.c
@@ -35,7 +35,9 @@ void whirpool_orient_graph(void) {
 }
 
 void bhv_whirlpool_loop(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 5000.0f) {
+#endif
         o->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
 
         // not sure if actually an array
@@ -52,10 +54,12 @@ void bhv_whirlpool_loop(void) {
         whirpool_orient_graph();
 
         o->oFaceAngleYaw += 0x1F40;
+#ifndef NODRAWINGDISTANCE
     } else {
         o->header.gfx.node.flags |= GRAPH_RENDER_INVISIBLE;
         gEnvFxBubbleConfig[ENVFX_STATE_PARTICLECOUNT] = 0;
     }
+#endif
 
     cur_obj_play_sound_1(SOUND_ENV_WATER);
 

From bea82c00bcce52afb02cbc72a0f8d8163ad3a321 Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Wed, 13 May 2020 09:25:45 +0200
Subject: [PATCH 2/7] Increase GFX_POOL_SIZE to fix overflow in 32bit version -
 thanks fgsfds

---
 src/game/display.h   | 2 +-
 src/game/game_init.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/game/display.h b/src/game/display.h
index 0c42711..877c4f0 100644
--- a/src/game/display.h
+++ b/src/game/display.h
@@ -3,7 +3,7 @@
 
 #include "types.h"
 
-#define GFX_POOL_SIZE 6400
+#define GFX_POOL_SIZE 64000
 
 extern u16 frameBufferIndex;
 extern u32 gGlobalTimer;
diff --git a/src/game/game_init.h b/src/game/game_init.h
index 68db742..019bad4 100644
--- a/src/game/game_init.h
+++ b/src/game/game_init.h
@@ -51,7 +51,7 @@ extern struct MarioAnimation gDemo;
 extern u8 gMarioAnims[];
 extern u8 gDemoInputs[];
 
-#define GFX_POOL_SIZE 6400
+#define GFX_POOL_SIZE 64000
 
 struct GfxPool {
     Gfx buffer[GFX_POOL_SIZE];

From 87dac5d916bddb50f5193d96db09f1ddbd0b61ab Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 16:11:59 +0200
Subject: [PATCH 3/7] fix bugged Heave-Ho in Wet-Dry World

---
 src/game/behaviors/heave_ho.inc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/game/behaviors/heave_ho.inc.c b/src/game/behaviors/heave_ho.inc.c
index 2f9da86..2cbd1f0 100644
--- a/src/game/behaviors/heave_ho.inc.c
+++ b/src/game/behaviors/heave_ho.inc.c
@@ -72,19 +72,19 @@ void heave_ho_act_3(void) {
 }
 
 void heave_ho_act_0(void) {
-    cur_obj_set_pos_to_home();
 #ifndef NODRAWINGDISTANCE
     if (find_water_level(o->oPosX, o->oPosZ) < o->oPosY && o->oDistanceToMario < 4000.0f) {
+#else
+    if (find_water_level(o->oPosX, o->oPosZ) < (o->oPosY - 50.0f)) {
 #endif
+        cur_obj_set_pos_to_home();
         cur_obj_become_tangible();
         cur_obj_unhide();
         o->oAction = 1;
-#ifndef NODRAWINGDISTANCE
     } else {
         cur_obj_become_intangible();
         cur_obj_hide();
     }
-#endif
 }
 
 void (*sHeaveHoActions[])(void) = { heave_ho_act_0, heave_ho_act_1, heave_ho_act_2, heave_ho_act_3 };

From a773e68c15498e13b4486f70a1bdf6482147062b Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 16:24:00 +0200
Subject: [PATCH 4/7] fix Lakitu's cloud not appearing from a distance

---
 src/game/behaviors/enemy_lakitu.inc.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/game/behaviors/enemy_lakitu.inc.c b/src/game/behaviors/enemy_lakitu.inc.c
index 056c3f1..cacd732 100644
--- a/src/game/behaviors/enemy_lakitu.inc.c
+++ b/src/game/behaviors/enemy_lakitu.inc.c
@@ -24,12 +24,16 @@ static struct ObjectHitbox sEnemyLakituHitbox = {
  * Wait for mario to approach, then spawn the cloud and become visible.
  */
 static void enemy_lakitu_act_uninitialized(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 2000.0f) {
+#endif
         spawn_object_relative_with_scale(CLOUD_BP_LAKITU_CLOUD, 0, 0, 0, 2.0f, o, MODEL_MIST, bhvCloud);
 
         cur_obj_unhide();
         o->oAction = ENEMY_LAKITU_ACT_MAIN;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**

From 8d2e0f5ffdca4df6dc6aea5d798b700d7ee7457b Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 17:07:14 +0200
Subject: [PATCH 5/7] fix Fwoosh in Tall, Tall Mountain

---
 src/game/behaviors/butterfly.inc.c | 1 +
 src/game/behaviors/cloud.inc.c     | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/game/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c
index 9296ed5..8c0e714 100644
--- a/src/game/behaviors/butterfly.inc.c
+++ b/src/game/behaviors/butterfly.inc.c
@@ -107,6 +107,7 @@ void bhv_butterfly_loop(void) {
             butterfly_act_return_home();
             break;
     }
+
 #ifndef NODRAWINGDISTANCE
     set_object_visibility(o, 3000);
 #endif
diff --git a/src/game/behaviors/cloud.inc.c b/src/game/behaviors/cloud.inc.c
index e5cb9be..fa82e3f 100644
--- a/src/game/behaviors/cloud.inc.c
+++ b/src/game/behaviors/cloud.inc.c
@@ -47,10 +47,14 @@ static void cloud_act_spawn_parts(void) {
  * Wait for mario to approach, then unhide and enter the spawn parts action.
  */
 static void cloud_act_fwoosh_hidden(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 2000.0f) {
+#endif
         cur_obj_unhide();
         o->oAction = CLOUD_ACT_SPAWN_PARTS;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**
@@ -58,9 +62,11 @@ static void cloud_act_fwoosh_hidden(void) {
  * long enough, blow wind at him.
  */
 static void cloud_fwoosh_update(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario > 2500.0f) {
         o->oAction = CLOUD_ACT_UNLOAD;
     } else {
+#endif
         if (o->oCloudBlowing) {
             o->header.gfx.scale[0] += o->oCloudGrowSpeed;
 
@@ -95,7 +101,9 @@ static void cloud_fwoosh_update(void) {
         }
 
         cur_obj_scale(o->header.gfx.scale[0]);
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 /**

From 2bdb1ab5513887912fa42696c5943782c2ba9c8f Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 18:47:12 +0200
Subject: [PATCH 6/7] several fixes and improvements

---
 src/game/behaviors/bub.inc.c                     | 4 ++++
 src/game/behaviors/butterfly.inc.c               | 2 --
 src/game/behaviors/fire_spitter.inc.c            | 4 ++++
 src/game/behaviors/lll_floating_wood_piece.inc.c | 6 ++++++
 src/game/behaviors/lll_rotating_hex_flame.inc.c  | 4 ++++
 src/game/obj_behaviors.c                         | 4 ++++
 6 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/game/behaviors/bub.inc.c b/src/game/behaviors/bub.inc.c
index e8e6309..7bf7169 100644
--- a/src/game/behaviors/bub.inc.c
+++ b/src/game/behaviors/bub.inc.c
@@ -8,11 +8,15 @@
 void bub_spawner_act_0(void) {
     s32 i;
     s32 sp18 = o->oBirdChirpChirpUnkF4;
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 1500.0f) {
+#endif
         for (i = 0; i < sp18; i++)
             spawn_object(o, MODEL_BUB, bhvBub);
         o->oAction = 1;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 void bub_spawner_act_1(void) {
diff --git a/src/game/behaviors/butterfly.inc.c b/src/game/behaviors/butterfly.inc.c
index 8c0e714..d435d8d 100644
--- a/src/game/behaviors/butterfly.inc.c
+++ b/src/game/behaviors/butterfly.inc.c
@@ -108,7 +108,5 @@ void bhv_butterfly_loop(void) {
             break;
     }
 
-#ifndef NODRAWINGDISTANCE
     set_object_visibility(o, 3000);
-#endif
 }
diff --git a/src/game/behaviors/fire_spitter.inc.c b/src/game/behaviors/fire_spitter.inc.c
index d64bcf7..a703b03 100644
--- a/src/game/behaviors/fire_spitter.inc.c
+++ b/src/game/behaviors/fire_spitter.inc.c
@@ -1,10 +1,14 @@
 
 static void fire_spitter_act_idle(void) {
     approach_f32_ptr(&o->header.gfx.scale[0], 0.2f, 0.002f);
+#ifndef NODRAWINGDISTANCE
     if (o->oTimer > 150 && o->oDistanceToMario < 800.0f && !(o->oMoveFlags & 0x00000078)) {
+#endif
         o->oAction = FIRE_SPITTER_ACT_SPIT_FIRE;
         o->oFireSpitterScaleVel = 0.05f;
+#ifndef NODRAWINGDISTANCE
     }
+#endif
 }
 
 static void fire_spitter_act_spit_fire(void) {
diff --git a/src/game/behaviors/lll_floating_wood_piece.inc.c b/src/game/behaviors/lll_floating_wood_piece.inc.c
index a484471..fad31f3 100644
--- a/src/game/behaviors/lll_floating_wood_piece.inc.c
+++ b/src/game/behaviors/lll_floating_wood_piece.inc.c
@@ -14,18 +14,24 @@ void bhv_lll_floating_wood_bridge_loop(void) {
     s32 i;
     switch (o->oAction) {
         case 0:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario < 2500.0f) {
+#endif
                 for (i = 1; i < 4; i++) {
                     sp3C = spawn_object_relative(0, (i - 2) * 300, 0, 0, o, MODEL_LLL_WOOD_BRIDGE,
                                                  bhvLllWoodPiece);
                     sp3C->oLllWoodPieceUnkF4 = i * 4096;
                 }
                 o->oAction = 1;
+#ifndef NODRAWINGDISTANCE
             }
+#endif
             break;
         case 1:
+#ifndef NODRAWINGDISTANCE
             if (o->oDistanceToMario > 2600.0f)
                 o->oAction = 2;
+#endif
             break;
         case 2:
             o->oAction = 0;
diff --git a/src/game/behaviors/lll_rotating_hex_flame.inc.c b/src/game/behaviors/lll_rotating_hex_flame.inc.c
index efabfca..fc70733 100644
--- a/src/game/behaviors/lll_rotating_hex_flame.inc.c
+++ b/src/game/behaviors/lll_rotating_hex_flame.inc.c
@@ -30,7 +30,9 @@ void fire_bar_spawn_flames(s16 a0) {
 }
 
 void fire_bar_act_0(void) {
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario < 3000.0f)
+#endif
         o->oAction = 1;
 }
 
@@ -45,8 +47,10 @@ void fire_bar_act_1(void) {
 void fire_bar_act_2(void) {
     o->oAngleVelYaw = -0x100;
     o->oMoveAngleYaw += o->oAngleVelYaw;
+#ifndef NODRAWINGDISTANCE
     if (o->oDistanceToMario > 3200.0f)
         o->oAction = 3;
+#endif
 }
 
 void fire_bar_act_3(void) {
diff --git a/src/game/obj_behaviors.c b/src/game/obj_behaviors.c
index 0e2c7c8..68cebe5 100644
--- a/src/game/obj_behaviors.c
+++ b/src/game/obj_behaviors.c
@@ -527,11 +527,15 @@ void set_object_visibility(struct Object *obj, s32 dist) {
     f32 objY = obj->oPosY;
     f32 objZ = obj->oPosZ;
 
+#ifndef NODRAWINGDISTANCE
     if (is_point_within_radius_of_mario(objX, objY, objZ, dist) == TRUE) {
+#endif
         obj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
+#ifndef NODRAWINGDISTANCE
     } else {
         obj->header.gfx.node.flags |= GRAPH_RENDER_INVISIBLE;
     }
+#endif
 }
 
 /**

From a26c36b6b4fb38683b82862ca77b6c1041efa10d Mon Sep 17 00:00:00 2001
From: uwabami <uwabami@localhost>
Date: Thu, 14 May 2020 19:08:30 +0200
Subject: [PATCH 7/7] fix Fire Spitter

---
 src/game/behaviors/fire_spitter.inc.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/game/behaviors/fire_spitter.inc.c b/src/game/behaviors/fire_spitter.inc.c
index a703b03..d64bcf7 100644
--- a/src/game/behaviors/fire_spitter.inc.c
+++ b/src/game/behaviors/fire_spitter.inc.c
@@ -1,14 +1,10 @@
 
 static void fire_spitter_act_idle(void) {
     approach_f32_ptr(&o->header.gfx.scale[0], 0.2f, 0.002f);
-#ifndef NODRAWINGDISTANCE
     if (o->oTimer > 150 && o->oDistanceToMario < 800.0f && !(o->oMoveFlags & 0x00000078)) {
-#endif
         o->oAction = FIRE_SPITTER_ACT_SPIT_FIRE;
         o->oFireSpitterScaleVel = 0.05f;
-#ifndef NODRAWINGDISTANCE
     }
-#endif
 }
 
 static void fire_spitter_act_spit_fire(void) {