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

A few minor fixes/cleanups (#449)

Browse source
This commit is contained in:
Roman971 2020-10-13 18:32:19 +02:00 • committed by GitHub
parent 57db7ba526
commit d02153707e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 38 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
View file

@ -109,14 +109,14 @@ void func_809C2218(EnBlkobj* this, GlobalContext* globalCtx) {
this->unk_166 += 1;
}
} else {
if ((this->unk_166++ < 0x65) ^ 1) {
temp = (this->unk_166 - 0x64) >> 2;
if (this->unk_166++ > 100) {
temp = (this->unk_166 - 100) >> 2;
if (temp > 5) {
temp = 5;
}
this->unk_164 += temp;
if (this->unk_164 > 0xFF) {
this->unk_164 = 0xFF;
if (this->unk_164 > 255) {
this->unk_164 = 255;
func_809C2060(this, func_809C22F4);
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
}
@ -171,7 +171,7 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->unk_164 != 0) {
func_809C2324(globalCtx, D_060014E0, this->unk_164);
}
temp_a3 = 0xFF - this->unk_164;
temp_a3 = 255 - this->unk_164;
if (temp_a3 != 0) {
func_809C2324(globalCtx, D_060053D0, temp_a3);
}

2
src/overlays/actors/ovl_En_Gs/z_en_gs.c
View file

@ -310,7 +310,7 @@ void func_80A4ED34(EnGs* this, GlobalContext* globalCtx) {
}
func_8002F974(&this->actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG);
if ((this->unk_200++ < 0x28) ^ 1) {
if (this->unk_200++ >= 40) {
this->unk_19E |= 0x10;
this->actor.flags |= 0x10;
this->actor.uncullZoneForward = 12000.0f;

2
src/overlays/actors/ovl_En_Ice_Hono/z_en_ice_hono.c
View file

@ -327,7 +327,7 @@ void EnIceHono_Update(Actor* thisx, GlobalContext* globalCtx) {
intensity = (Math_Rand_ZeroOne() * 0.05f) + ((sin154 * 0.125f) + (sin156 * 0.1f)) + 0.425f;
if ((intensity > 0.7f) || (intensity < 0.2f)) {
// Translates to: "impossible value(ratio = %f)"
osSyncPrintf("ありえない値(ratio = %f)\n", (f64)intensity);
osSyncPrintf("ありえない値(ratio = %f)\n", intensity);
}
Lights_PointNoGlowSetInfo(&this->lightInfo, this->actor.posRot.pos.x, (s16)this->actor.posRot.pos.y + 10,
this->actor.posRot.pos.z, (s32)(155.0f * intensity), (s32)(210.0f * intensity),

1
src/overlays/gamestates/ovl_title/z_title.c
View file

@ -63,7 +63,6 @@ void Title_SetupView(TitleContext* this, f32 x, f32 y, f32 z) {
void Title_Draw(TitleContext* this) {
static s16 sTitleRotY = 0;
static u32 D_808009A4 = 0;
static Lights1 sTitleLights = gdSPDefLights1(0x64, 0x64, 0x64, 0xFF, 0xFF, 0xFF, 0x45, 0x45, 0x45);
u16 y;