mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +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);
}