mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +00:00
Code Issues Projects Releases Wiki Activity

OnePointDemo OK (#719)

Browse source 
* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-03-31 11:18:31 -05:00 • committed by GitHub
parent 28cfd82a4f
commit 9b4482314a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 3949 additions and 7571 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
View file

@ -74,7 +74,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
camYaw = (Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000);
Matrix_RotateY(camYaw * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateY(camYaw * (M_PI / 0x8000), MTXMODE_APPLY);
scale = Math_SinS(this->life * 0x333) * (this->rScale * 0.00005f);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
@ -127,8 +127,8 @@ void EffectSsEnFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this)
if (this->rBodyPart < 0) {
Matrix_Translate(this->actor->world.pos.x, this->actor->world.pos.y, this->actor->world.pos.z,
MTXMODE_NEW);
Matrix_RotateY((this->rYaw + this->actor->shape.rot.y) * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateX((this->rPitch + this->actor->shape.rot.x) * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateY((this->rYaw + this->actor->shape.rot.y) * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateX((this->rPitch + this->actor->shape.rot.x) * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_MultVec3f(&this->vec, &this->pos);
} else {
if ((this->rFlags & 0x8000)) {

4
src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View file

@ -111,8 +111,8 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_en_ice.c", 261),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);

2
src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
View file

@ -57,7 +57,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fcircle.c", 163),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);

4
src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
View file

@ -103,8 +103,8 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
temp1 = fabsf(Math_CosS(yaw));
temp2 = Math_SinS(yaw);
dist = Math_Vec3f_DistXZ(&scale, &this->vec) / (this->rReg10 * 0.1f);
Matrix_RotateY((s16)(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000) * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateZ(temp2 * this->rReg2 * dist * 0.017453292f, MTXMODE_APPLY);
Matrix_RotateY((s16)(Camera_GetCamDirYaw(ACTIVE_CAM) + 0x8000) * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateZ(temp2 * this->rReg2 * dist * (M_PI / 180.0f), MTXMODE_APPLY);
temp2 = 1.0f - ((f32)(this->life + 1) / this->rLifespan);
temp2 = 1.0f - SQ(temp2);
scale.x = scale.y = scale.z = temp2 * (this->rScale * 0.000010000001f);

4
src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
View file

@ -65,8 +65,8 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * 0.0000958738f, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ice_piece.c", 185),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);

12
src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View file

@ -93,7 +93,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 scale;
s32 colorIdx;
scale = this->rScale * 0.00390625f;
scale = this->rScale / 256.0f;
colorIdx = this->rColorIdx;
OPEN_DISPS(gfxCtx, "../z_eff_kakera.c", 241);
@ -154,9 +154,9 @@ void func_809A9C10(EffectSs* this) {
f32 temp_f20;
f32 temp_f0;
temp_f18 = this->rReg5 * 0.0009765625f;
temp_f20 = this->rReg6 * 0.0009765625f;
temp_f14 = (this->rReg9 * 0.0009765625f) * 4.0f;
temp_f18 = this->rReg5 / 1024.0f;
temp_f20 = this->rReg6 / 1024.0f;
temp_f14 = (this->rReg9 / 1024.0f) * 4.0f;
temp_f2 = this->velocity.x - func_809A9818(0.0f, temp_f14);
temp_f16 = this->velocity.y - func_809A9818(0.0f, temp_f14);
@ -286,7 +286,7 @@ s32 func_809A9FD8(EffectSs* this, Vec3f* diff, f32 dist) {
temp_a1 = (this->rReg0 >> 7) & 0xF;
temp_f0 = D_809AA588[temp_a1](dist, temp_a1);
temp_f0 = func_809A9818(temp_f0, (this->rReg9 * temp_f0) * 0.0009765625f);
temp_f0 = func_809A9818(temp_f0, (this->rReg9 * temp_f0) / 1024.0f);
this->accel.x *= temp_f0;
this->accel.y *= temp_f0;
@ -300,7 +300,7 @@ s32 func_809A9FD8(EffectSs* this, Vec3f* diff, f32 dist) {
}
s32 func_809AA0B8(EffectSs* this, Vec3f* diff, f32 dist) {
this->accel.y += this->rGravity * 0.00390625f;
this->accel.y += this->rGravity / 256.0f;
return 1;
}