summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
Diffstat (limited to 'src/code')
-rw-r--r--src/code/speed_meter.c2
-rw-r--r--src/code/z_actor.c2
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_collision_check.c2
-rw-r--r--src/code/z_effect_soft_sprite.c2
-rw-r--r--src/code/z_fcurve_data_skelanime.c2
-rw-r--r--src/code/z_malloc.c2
-rw-r--r--src/code/z_overlay.c2
-rw-r--r--src/code/z_parameter.c2
-rw-r--r--src/code/z_play.c2
-rw-r--r--src/code/z_play_hireso.c2
-rw-r--r--src/code/z_skelanime.c2
-rw-r--r--src/code/z_skin_awb.c2
13 files changed, 13 insertions, 13 deletions
diff --git a/src/code/speed_meter.c b/src/code/speed_meter.c
index df477db77..1d57fd74c 100644
--- a/src/code/speed_meter.c
+++ b/src/code/speed_meter.c
@@ -6,7 +6,7 @@
#include "regs.h"
#include "sys_cfb.h"
#include "z64game.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64view.h"
/**
diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index 8ca728435..428404ae7 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -34,7 +34,7 @@ struct Actor* D_801ED920; // 2 funcs. 1 out of z_actor
#include "z64door.h"
#include "z64circle_tex.h"
#include "z64horse.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64quake.h"
#include "z64rumble.h"
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 58f57cd93..143a003db 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -48,7 +48,7 @@
#include "global.h"
#include "string.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64olib.h"
#include "z64quake.h"
#include "z64shrink_window.h"
diff --git a/src/code/z_collision_check.c b/src/code/z_collision_check.c
index 255a9d5a6..bf63e6912 100644
--- a/src/code/z_collision_check.c
+++ b/src/code/z_collision_check.c
@@ -9,7 +9,7 @@
#include "z64actor.h"
#include "z64effect.h"
#include "z64frameadvance.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64math.h"
typedef s32 (*ColChkResetFunc)(struct PlayState*, Collider*);
diff --git a/src/code/z_effect_soft_sprite.c b/src/code/z_effect_soft_sprite.c
index e76942d4a..4ff5c72d6 100644
--- a/src/code/z_effect_soft_sprite.c
+++ b/src/code/z_effect_soft_sprite.c
@@ -2,7 +2,7 @@
#include "tha.h"
#include "loadfragment.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "global.h"
void EffectSS_ResetEntry(EffectSs* particle);
diff --git a/src/code/z_fcurve_data_skelanime.c b/src/code/z_fcurve_data_skelanime.c
index 2cc953246..148d8b1f6 100644
--- a/src/code/z_fcurve_data_skelanime.c
+++ b/src/code/z_fcurve_data_skelanime.c
@@ -31,7 +31,7 @@
#include "z64actor.h"
#include "z64animation.h"
#include "z64curve.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64.h"
void SkelCurve_Clear(SkelCurve* skelCurve) {
diff --git a/src/code/z_malloc.c b/src/code/z_malloc.c
index 815af1943..508eb1ed9 100644
--- a/src/code/z_malloc.c
+++ b/src/code/z_malloc.c
@@ -1,4 +1,4 @@
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "libc64/os_malloc.h"
diff --git a/src/code/z_overlay.c b/src/code/z_overlay.c
index dd20a6b3c..a72a979ce 100644
--- a/src/code/z_overlay.c
+++ b/src/code/z_overlay.c
@@ -8,7 +8,7 @@
#include "loadfragment.h"
#include "z64lib.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
void* TransitionOverlay_VramToRam(TransitionOverlay* overlayEntry, void* vramAddr) {
void* loadedRamAddr = Lib_PhysicalToVirtual(overlayEntry->loadInfo.addr);
diff --git a/src/code/z_parameter.c b/src/code/z_parameter.c
index dcb3fb1dd..328378b48 100644
--- a/src/code/z_parameter.c
+++ b/src/code/z_parameter.c
@@ -4,7 +4,7 @@
#include "sys_cmpdma.h"
#include "sys_ucode.h"
#include "z64lifemeter.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64snap.h"
#include "z64view.h"
#include "z64voice.h"
diff --git a/src/code/z_play.c b/src/code/z_play.c
index 4cd730148..df8f267cf 100644
--- a/src/code/z_play.c
+++ b/src/code/z_play.c
@@ -23,7 +23,7 @@ u8 sMotionBlurStatus;
#include "z64bombers_notebook.h"
#include "z64debug_display.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "z64quake.h"
#include "z64rumble.h"
#include "z64shrink_window.h"
diff --git a/src/code/z_play_hireso.c b/src/code/z_play_hireso.c
index eb8e4831c..c91d43605 100644
--- a/src/code/z_play_hireso.c
+++ b/src/code/z_play_hireso.c
@@ -2,7 +2,7 @@
#include "sys_cfb.h"
#include "sys_cmpdma.h"
#include "z64bombers_notebook.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#include "assets/interface/schedule_static/schedule_static.h"
#include "assets/archives/schedule_dma_static/schedule_dma_static_yar.h"
diff --git a/src/code/z_skelanime.c b/src/code/z_skelanime.c
index 2dfde0394..6409a6a41 100644
--- a/src/code/z_skelanime.c
+++ b/src/code/z_skelanime.c
@@ -1,5 +1,5 @@
#include "global.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
#define ANIM_INTERP 1
diff --git a/src/code/z_skin_awb.c b/src/code/z_skin_awb.c
index cd753fc8b..3039b2ea8 100644
--- a/src/code/z_skin_awb.c
+++ b/src/code/z_skin_awb.c
@@ -1,7 +1,7 @@
#include "z64skin.h"
#include "global.h"
-#include "z64malloc.h"
+#include "zelda_arena.h"
void Skin_Setup(Skin* skin) {
skin->skeletonHeader = NULL;