From 06e10fb2cbf309776dc907d7fb970b96940f7a72 Mon Sep 17 00:00:00 2001
From: Lurs <2795933+Lurs@users.noreply.github.com>
Date: Mon, 6 Apr 2026 23:08:34 +0200
Subject: [PATCH] Use HEAP_SIZE()

---
 src/d/d_k_wmark.cpp | 7 ++-----
 src/d/d_kankyo.cpp  | 7 ++-----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/d/d_k_wmark.cpp b/src/d/d_k_wmark.cpp
index 3894e965c3..b93ab14211 100644
--- a/src/d/d_k_wmark.cpp
+++ b/src/d/d_k_wmark.cpp
@@ -6,6 +6,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_k_wmark.h"
+#include "dusk/memory.h"
 #include "JSystem/J3DGraphBase/J3DMaterial.h"
 #include "SSystem/SComponent/c_math.h"
 #include "d/actor/d_a_player.h"
@@ -33,11 +34,7 @@ int dkWmark_c::create() {
         mColorType = this->parameters;
     }
 
-#if TARGET_PC
-    mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x1100, 0x20);
-#else
-    mpHeap = mDoExt_createSolidHeapFromGameToCurrent(0x880, 0x20);
-#endif
+    mpHeap = mDoExt_createSolidHeapFromGameToCurrent(HEAP_SIZE(0x880, 0x1100), 0x20);
     if (mpHeap != NULL) {
         JKRHEAP_NAME(mpHeap, "dkWmark_c::mpHeap");
         J3DModelData* modelData = (J3DModelData*)dComIfG_getObjectRes("Alink", 0x23);
diff --git a/src/d/d_kankyo.cpp b/src/d/d_kankyo.cpp
index 9326555777..1652f3c2a0 100644
--- a/src/d/d_kankyo.cpp
+++ b/src/d/d_kankyo.cpp
@@ -1,6 +1,7 @@
 #include "d/dolzel.h" // IWYU pragma: keep
 
 #include "d/d_kankyo.h"
+#include "dusk/memory.h"
 #ifdef __REVOLUTION_SDK__
 #include <revolution.h>
 #else
@@ -1175,11 +1176,7 @@ static void undwater_init() {
     J3DModelData* modelData2 = (J3DModelData*)dComIfG_getObjectRes("Always", 0x1D);
     JUT_ASSERT(1867, modelData2 != NULL);
 
-#if TARGET_PC
-    g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(0xC00, 0x20);
-#else
-    g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(0x600, 0x20);
-#endif
+    g_env_light.undwater_ef_heap = mDoExt_createSolidHeapFromGameToCurrent(HEAP_SIZE(0x600, 0xC00), 0x20);
     JKRHEAP_NAME(g_env_light.undwater_ef_heap, "g_env_light.undwater_ef_heap");
 
     if (g_env_light.undwater_ef_heap != NULL) {