MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-25 22:09:34 +00:00
Code Releases Wiki Activity

framerate fixes

Browse Source
This commit is contained in:
Blake Warner 2022-04-09 17:52:16 -04:00
parent 1640ea6068
commit 034a869409
6 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/framerate.h
View File

@ -150,7 +150,7 @@ class Timer
class TimerU8 : public Timer
{
public:
TimerU8() : Timer(-0x80, 0x7F)
TimerU8() : Timer(0, 0xFF)
{
}
@ -158,7 +158,23 @@ class TimerU8 : public Timer
{
}
TimerU8(float n) : Timer(n, -0x80, 0x7F)
TimerU8(float n) : Timer(n, 0, 0xFF)
{
}
};
class TimerS8 : public Timer
{
public:
TimerS8() : Timer(-0x80, 0x7F)
{
}
TimerS8(const Timer& t) : Timer(t)
{
}
TimerS8(float n) : Timer(n, -0x80, 0x7F)
{
}
};
@ -166,7 +182,7 @@ class TimerU8 : public Timer
class TimerU16 : public Timer
{
public:
TimerU16() : Timer(-0x8000, 0x7FFF)
TimerU16() : Timer(0, 0xFFFF)
{
}
@ -174,7 +190,7 @@ class TimerU16 : public Timer
{
}
TimerU16(float n) : Timer(n, -0x8000, 0x7FFF)
TimerU16(float n) : Timer(n, 0, 0xFFFF)
{
}
};
@ -182,8 +198,6 @@ class TimerU16 : public Timer
typedef TimerU16 Counter;
typedef Timer Rotation;
typedef Timer Position;
//typedef Timer TimerU8;
//typedef Timer TimerU16;
typedef Timer TimerS16;
typedef Timer TimerS32;
typedef Timer TimerU32;

2
include/z64save.h
View File

@ -371,7 +371,7 @@ namespace oot::save
/* 0x1416 */ u16 nextDayTime; // "next_zelda_time"
/* 0x1418 */ u8 fadeDuration;
/* 0x1419 */ u8 unk_1419; // transition related
/* 0x141A */ Counter skyboxTime;
/* 0x141A */ TimerU16 skyboxTime;
/* 0x141C */ u8 dogIsLost;
/* 0x141D */ u8 nextTransition;
/* 0x141E */ char unk_141E[0x0002];

4
src/overlays/actors/ovl_En_Go/z_en_go.cpp
View File

@ -1478,9 +1478,7 @@ void EnGo_DrawDust(EnGo* pthis, GlobalContext* globalCtx)
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go.c", 2626);
firstDone = false;
func_80093D84(globalCtx->state.gfxCtx);
if(1)
{
}
for(i = 0; i < ARRAY_COUNT(pthis->dustEffects); i++, dustEffect++)
{
if(dustEffect->type)

8
src/overlays/actors/ovl_En_Go/z_en_go.h
View File

@ -25,14 +25,14 @@ typedef s16 (*callback2_80A3ED24)(GlobalContext*, struct EnGo*);
struct EnGoEffect
{
/* 0x0000 */ u8 type;
/* 0x0001 */ u8 timer;
/* 0x0002 */ u8 initialTimer;
/* 0x0001 */ TimerU8 timer;
/* 0x0002 */ TimerU8 initialTimer;
/* 0x0004 */ f32 scale;
/* 0x0008 */ f32 scaleStep;
/* 0x000C */ Color_RGBA8 color;
/* 0x0010 */ char unk_10[4];
/* 0x0014 */ Vec3f pos;
/* 0x0020 */ Vec3f velocity;
/* 0x0014 */ VecPos pos;
/* 0x0020 */ VecRot velocity;
/* 0x002C */ Vec3f accel;
};

4
src/overlays/actors/ovl_En_Go2/z_en_go2.cpp
View File

@ -1440,7 +1440,7 @@ s32 EnGo2_IsCameraModified(EnGo2* pthis, GlobalContext* globalCtx)
}
}
void EnGo2_DefaultWakingUp(EnGo2* pthis)
void EnGo2_Awake(EnGo2* pthis)
{
if(EnGo2_IsWakingUp(pthis))
{
@ -1509,7 +1509,7 @@ void EnGo2_SelectGoronWakingUp(EnGo2* pthis)
break;
}
default:
EnGo2_DefaultWakingUp(pthis);
EnGo2_Awake(pthis);
}
}

2
src/overlays/actors/ovl_En_Go2/z_en_go2.h
View File

@ -60,7 +60,7 @@ struct EnGo2DataStruct2
struct EnGo2DustEffectData
{
u8 initialTimer;
TimerU8 initialTimer;
f32 scale;
f32 scaleStep;
s32 numDustEffects;