falso
/
oot
mirror of https://github.com/zeldaret/oot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix a few warnings (#998) 

* Fix some warnings

* Revert warning fixes in audio code
This commit is contained in:
Dragorn421 2021-10-11 22:16:43 +02:00 committed by GitHub
parent a6554b4f84
commit ed487b4bb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/functions.h
View File

@ -908,6 +908,8 @@ void Environment_ClearBgsDayCount(void);
s32 Environment_GetTotalDays(void); s32 Environment_GetTotalDays(void);
void func_800775F0(u16); void func_800775F0(u16);
s32 func_80077600(void); s32 func_80077600(void);
void func_80077624(GlobalContext* globalCtx);
void func_80077684(GlobalContext* globalCtx);
void Environment_WarpSongLeave(GlobalContext* globalCtx); void Environment_WarpSongLeave(GlobalContext* globalCtx);
void Lib_MemSet(u8* dest, size_t size, u8 val); void Lib_MemSet(u8* dest, size_t size, u8 val);
f32 Math_CosS(s16 angle); f32 Math_CosS(s16 angle);

2
src/code/code_800BB0A0.c
View File

@ -45,7 +45,7 @@ s32 func_800BB2B4(Vec3f* pos, f32* roll, f32* fov, CutsceneCameraPoint* point, s
pointData[i][4] = point[key + i].viewAngle; 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) { if (point[*keyFrame + 1].nextPointFrame != 0) {
speed1 = 1.0f / point[*keyFrame + 1].nextPointFrame; speed1 = 1.0f / point[*keyFrame + 1].nextPointFrame;

2
src/code/z_sram.c
View File

@ -383,7 +383,7 @@ void Sram_OpenSave(SramContext* sramCtx) {
MemCopy(gScarecrowCustomSongPtr, &gSaveContext.scarecrowCustomSong, 0x360); MemCopy(gScarecrowCustomSongPtr, &gSaveContext.scarecrowCustomSong, 0x360);
ptr = gScarecrowCustomSongPtr; ptr = (u8*)gScarecrowCustomSongPtr;
for (i = 0; i < 0x360; i++, ptr++) { for (i = 0; i < 0x360; i++, ptr++) {
osSyncPrintf("%d, ", *ptr); osSyncPrintf("%d, ", *ptr);
} }

4
src/overlays/actors/ovl_En_In/z_en_in.c
View File

@ -981,8 +981,8 @@ void EnIn_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec
} }
void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnIn_Draw(Actor* thisx, GlobalContext* globalCtx) {
static UNK_TYPE* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0, static void* D_80A7B9B4[] = { object_in_Tex_003590, object_in_Tex_0047D0, object_in_Tex_004BD0,
object_in_Tex_004390 }; object_in_Tex_004390 };
EnIn* this = THIS; EnIn* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384); OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_in.c", 2384);