From 9eea9289b1c4316d5856d1cb9602ee463d7de989 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Sun, 28 Sep 2025 16:11:07 -0400
Subject: Fix JUT_ASSERT and several other macros (#2711)

* Fix JUT_ASSERT to be a nested define

* Switch names that appear in asserts to be constants instead of defines

* Replace `0` in asserts with `NULL` or `FALSE`

* Fix fpclassify

* Fix ARRAY_SIZE

* Use G_CM3D_F_INF

* More fixes for fpclassify

* Remove FLOAT_LABEL

* Remove incorrect FLAG_ON macro

* Remove UNK_BSS macro

* Silence clangd unused header warning for PCH
---
 src/d/actor/d_a_ep.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/d/actor/d_a_ep.cpp')

diff --git a/src/d/actor/d_a_ep.cpp b/src/d/actor/d_a_ep.cpp
index 7cfc73cfda..9748a60b6e 100644
--- a/src/d/actor/d_a_ep.cpp
+++ b/src/d/actor/d_a_ep.cpp
@@ -2,7 +2,7 @@
 // Translation Unit: d_a_ep
 //
 
-#include "d/dolzel_rel.h"
+#include "d/dolzel_rel.h" // IWYU pragma: keep
 
 #include "d/actor/d_a_ep.h"
 #include "d/actor/d_a_player.h"
@@ -820,7 +820,7 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
     ep_class* i_this = (ep_class*)a_this;
 
     void* modelData = dComIfG_getObjectRes("Ep", model_d[i_this->field_0xa5a]);
-    JUT_ASSERT(0x855, modelData != 0);
+    JUT_ASSERT(0x855, modelData != NULL);
 
     i_this->mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
     if (i_this->mpModel == NULL) {
@@ -831,7 +831,7 @@ static int daEp_CreateHeap(fopAc_ac_c* a_this) {
     i_this->mpModel->setBaseTRMtx(*calc_mtx);
 
     modelData = dComIfG_getObjectRes("Ep", 7);
-    JUT_ASSERT(0x884, modelData != 0);
+    JUT_ASSERT(0x884, modelData != NULL);
 
     for (int i = 0; i < 6; i++) {
         i_this->mHahen[i].mpModel = mDoExt_J3DModel__create((J3DModelData*)modelData, 0x80000, 0x11000084);
-- 
cgit v1.2.3