diff --git a/include/functions.h b/include/functions.h index 2fc93c9cff..005fd47c63 100644 --- a/include/functions.h +++ b/include/functions.h @@ -908,6 +908,8 @@ void Environment_ClearBgsDayCount(void); s32 Environment_GetTotalDays(void); void func_800775F0(u16); s32 func_80077600(void); +void func_80077624(GlobalContext* globalCtx); +void func_80077684(GlobalContext* globalCtx); void Environment_WarpSongLeave(GlobalContext* globalCtx); void Lib_MemSet(u8* dest, size_t size, u8 val); f32 Math_CosS(s16 angle); diff --git a/src/code/code_800BB0A0.c b/src/code/code_800BB0A0.c index 1c92231078..0f2ee7d744 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 44287017b2..195da41b51 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 79c42dc2b6..9e8800e8f9 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);