diff options
| author | Dragorn421 <Dragorn421@users.noreply.github.com> | 2021-10-11 22:16:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 16:16:43 -0400 |
| commit | ed487b4bb849b027481c2d52b06aa5bec9d44f2c (patch) | |
| tree | 05b81757b82ec8317278a05008413f0503c812fa /src | |
| parent | a6554b4f846beed906641e2ee3eb82e20283b935 (diff) | |
Fix a few warnings (#998)
* Fix some warnings
* Revert warning fixes in audio code
Diffstat (limited to 'src')
| -rw-r--r-- | src/code/code_800BB0A0.c | 2 | ||||
| -rw-r--r-- | src/code/z_sram.c | 2 | ||||
| -rw-r--r-- | src/overlays/actors/ovl_En_In/z_en_in.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/code/code_800BB0A0.c b/src/code/code_800BB0A0.c index 1c9223107..0f2ee7d74 100644 --- a/src/code/code_800BB0A0.c +++ b/src/code/code_800BB0A0.c @@ -45,7 +45,7 @@ s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s pointData[i][4] = point[key + i].viewAngle; } - func_800BB0A0(progress, pos, roll, fov, &pointData[0], &pointData[1], &pointData[2], &pointData[3]); + func_800BB0A0(progress, pos, roll, fov, pointData[0], pointData[1], pointData[2], pointData[3]); if (point[*keyFrame + 1].nextPointFrame != 0) { speed1 = 1.0f / point[*keyFrame + 1].nextPointFrame; diff --git a/src/code/z_sram.c b/src/code/z_sram.c index 44287017b..195da41b5 100644 --- a/src/code/z_sram.c +++ b/src/code/z_sram.c @@ -383,7 +383,7 @@ void Sram_OpenSave(SramContext* sramCtx) { MemCopy(gScarecrowCustomSongPtr, &gSaveContext.scarecrowCustomSong, 0x360); - ptr = gScarecrowCustomSongPtr; + ptr = (u8*)gScarecrowCustomSongPtr; for (i = 0; i < 0x360; i++, ptr++) { osSyncPrintf("%d, ", *ptr); } diff --git a/src/overlays/actors/ovl_En_In/z_en_in.c b/src/overlays/actors/ovl_En_In/z_en_in.c index 79c42dc2b..9e8800e8f 100644 --- a/src/overlays/actors/ovl_En_In/z_en_in.c +++ b/src/overlays/actors/ovl_En_In/z_en_in.c @@ -981,8 +981,8 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec } void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { - static UNK_TYPE* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0, - object_in_Tex_004390 }; + static void* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0, + object_in_Tex_004390 }; EnIn* this = THIS; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384); |