summaryrefslogtreecommitdiff
path: root/src/code
diff options
context:
space:
mode:
authorAnghelo Carvajal <angheloalf95@gmail.com>2023-11-27 23:01:14 -0300
committerGitHub <noreply@github.com>2023-11-28 13:01:14 +1100
commit7649cd309af155de1b8ee8bfd32d850e46f27925 (patch)
tree8c66e552901046c002e951691fb063bf5be2b00f /src/code
parent2fdcdd91b332d234a823e43607978e010152b811 (diff)
Organize `libc` and `libm` files (#1499)
* memmove * strcpy * strcmp * memset * fmodf * fix some missing includes * Remove libc header dependencies on libultra * fix * review
Diffstat (limited to 'src/code')
-rw-r--r--src/code/cutscene_camera.c5
-rw-r--r--src/code/z_camera.c2
-rw-r--r--src/code/z_kankyo.c3
-rw-r--r--src/code/z_quake.c3
4 files changed, 8 insertions, 5 deletions
diff --git a/src/code/cutscene_camera.c b/src/code/cutscene_camera.c
index d5f3ef4a3..53474bf88 100644
--- a/src/code/cutscene_camera.c
+++ b/src/code/cutscene_camera.c
@@ -1,4 +1,5 @@
#include "global.h"
+#include "libc/string.h"
static CutsceneCamera* sCurCsCamera;
@@ -44,8 +45,8 @@ s32 CutsceneCamera_Init(Camera* camera, CutsceneCamera* csCamera) {
sCurCsCamera = csCamera;
- __osMemset(&csCamera->eyeInterp, 0, sizeof(CutsceneCameraInterp));
- __osMemset(&csCamera->atInterp, 0, sizeof(CutsceneCameraInterp));
+ memset(&csCamera->eyeInterp, 0, sizeof(CutsceneCameraInterp));
+ memset(&csCamera->atInterp, 0, sizeof(CutsceneCameraInterp));
csCamera->eyeInterp.type = csCamera->atInterp.type = CS_CAM_INTERP_OFF;
diff --git a/src/code/z_camera.c b/src/code/z_camera.c
index 0bfcafed0..5b58e939a 100644
--- a/src/code/z_camera.c
+++ b/src/code/z_camera.c
@@ -6955,7 +6955,7 @@ void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState
s16 curUID;
s16 j;
- __osMemset(camera, 0, sizeof(Camera));
+ memset(camera, 0, sizeof(Camera));
camera->play = sCamPlayState = play;
curUID = sCameraNextUID;
diff --git a/src/code/z_kankyo.c b/src/code/z_kankyo.c
index 98fdc84fb..506d7d358 100644
--- a/src/code/z_kankyo.c
+++ b/src/code/z_kankyo.c
@@ -65,6 +65,7 @@ Gfx* sSkyboxStarsDList;
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/gameplay_field_keep/gameplay_field_keep.h"
#include "overlays/kaleido_scope/ovl_kaleido_scope/z_kaleido_scope.h"
+#include "libc/string.h"
// Data
f32 sSandstormLerpScale = 0.0f;
@@ -1298,7 +1299,7 @@ void Environment_UpdateLights(PlayState* play, EnvironmentContext* envCtx, Light
AdjLightSettings spA4[4];
var_fs3 = 0.0f;
- __osMemset(spA4, 0, sizeof(AdjLightSettings) * ARRAY_COUNT(spA4));
+ memset(spA4, 0, sizeof(AdjLightSettings) * ARRAY_COUNT(spA4));
lightSettingsList = play->envCtx.lightSettingsList;
if ((envCtx->lightSettingOverride != LIGHT_SETTING_OVERRIDE_NONE) &&
diff --git a/src/code/z_quake.c b/src/code/z_quake.c
index 19db37c63..9423983e1 100644
--- a/src/code/z_quake.c
+++ b/src/code/z_quake.c
@@ -1,5 +1,6 @@
#include "prevent_bss_reordering.h"
#include "global.h"
+#include "libc/string.h"
#include "z64quake.h"
#include "z64view.h"
@@ -174,7 +175,7 @@ QuakeRequest* Quake_RequestImpl(Camera* camera, u32 type) {
s16 index = Quake_GetFreeIndex();
QuakeRequest* req = &sQuakeRequests[index];
- __osMemset(req, 0, sizeof(QuakeRequest));
+ memset(req, 0, sizeof(QuakeRequest));
req->camera = camera;
req->camId = camera->camId;