mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-07 14:50:15 +00:00
Decompile z_kankyo (#956)
* working * start color switch * progress * progress * progress on bgm func * progress * game over matched (except the rodata meme) * start update * progress * lightning docs done * progress * progress * progress * progress * progress * can compile at least * suns state, progress on kankyo_update * some new names * progress * progress * progress * new functions * cleanup * more matches * another match * now functional * format * better match * hugely improved update * cleanup/review * remove old changes * review2 * review3 * missed one * review4 * change asm filenames * update doorwarp1 * review5 * Kankyo_ -> Environment_ * format * merge master and format functions.h Co-authored-by: Jacob Young <jacobly0@users.noreply.github.com> Co-authored-by: fig <fig02srl@gmail.com> Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
parent
50095d427c
commit
e51f50f0ff
139 changed files with 3478 additions and 6277 deletions
|
@ -1198,57 +1198,57 @@ void BossGoma_Defeated(BossGoma* this, GlobalContext* globalCtx) {
|
|||
|
||||
if (this->blinkTimer != 0) {
|
||||
this->blinkTimer--;
|
||||
globalCtx->envCtx.unk_8C[0][0] += 40;
|
||||
globalCtx->envCtx.unk_8C[0][1] += 40;
|
||||
globalCtx->envCtx.unk_8C[0][2] += 80;
|
||||
globalCtx->envCtx.unk_8C[2][0] += 10;
|
||||
globalCtx->envCtx.unk_8C[2][1] += 10;
|
||||
globalCtx->envCtx.unk_8C[2][2] += 20;
|
||||
globalCtx->envCtx.adjAmbientColor[0] += 40;
|
||||
globalCtx->envCtx.adjAmbientColor[1] += 40;
|
||||
globalCtx->envCtx.adjAmbientColor[2] += 80;
|
||||
globalCtx->envCtx.adjFogColor[0] += 10;
|
||||
globalCtx->envCtx.adjFogColor[1] += 10;
|
||||
globalCtx->envCtx.adjFogColor[2] += 20;
|
||||
} else {
|
||||
globalCtx->envCtx.unk_8C[0][0] -= 20;
|
||||
globalCtx->envCtx.unk_8C[0][1] -= 20;
|
||||
globalCtx->envCtx.unk_8C[0][2] -= 40;
|
||||
globalCtx->envCtx.unk_8C[2][0] -= 5;
|
||||
globalCtx->envCtx.unk_8C[2][1] -= 5;
|
||||
globalCtx->envCtx.unk_8C[2][2] -= 10;
|
||||
globalCtx->envCtx.adjAmbientColor[0] -= 20;
|
||||
globalCtx->envCtx.adjAmbientColor[1] -= 20;
|
||||
globalCtx->envCtx.adjAmbientColor[2] -= 40;
|
||||
globalCtx->envCtx.adjFogColor[0] -= 5;
|
||||
globalCtx->envCtx.adjFogColor[1] -= 5;
|
||||
globalCtx->envCtx.adjFogColor[2] -= 10;
|
||||
}
|
||||
|
||||
if (globalCtx->envCtx.unk_8C[0][0] > 200) {
|
||||
globalCtx->envCtx.unk_8C[0][0] = 200;
|
||||
if (globalCtx->envCtx.adjAmbientColor[0] > 200) {
|
||||
globalCtx->envCtx.adjAmbientColor[0] = 200;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[0][1] > 200) {
|
||||
globalCtx->envCtx.unk_8C[0][1] = 200;
|
||||
if (globalCtx->envCtx.adjAmbientColor[1] > 200) {
|
||||
globalCtx->envCtx.adjAmbientColor[1] = 200;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[0][2] > 200) {
|
||||
globalCtx->envCtx.unk_8C[0][2] = 200;
|
||||
if (globalCtx->envCtx.adjAmbientColor[2] > 200) {
|
||||
globalCtx->envCtx.adjAmbientColor[2] = 200;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][0] > 70) {
|
||||
globalCtx->envCtx.unk_8C[2][0] = 70;
|
||||
if (globalCtx->envCtx.adjFogColor[0] > 70) {
|
||||
globalCtx->envCtx.adjFogColor[0] = 70;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][1] > 70) {
|
||||
globalCtx->envCtx.unk_8C[2][1] = 70;
|
||||
if (globalCtx->envCtx.adjFogColor[1] > 70) {
|
||||
globalCtx->envCtx.adjFogColor[1] = 70;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][2] > 140) {
|
||||
globalCtx->envCtx.unk_8C[2][2] = 140;
|
||||
if (globalCtx->envCtx.adjFogColor[2] > 140) {
|
||||
globalCtx->envCtx.adjFogColor[2] = 140;
|
||||
}
|
||||
|
||||
if (globalCtx->envCtx.unk_8C[0][0] < 0) {
|
||||
globalCtx->envCtx.unk_8C[0][0] = 0;
|
||||
if (globalCtx->envCtx.adjAmbientColor[0] < 0) {
|
||||
globalCtx->envCtx.adjAmbientColor[0] = 0;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[0][1] < 0) {
|
||||
globalCtx->envCtx.unk_8C[0][1] = 0;
|
||||
if (globalCtx->envCtx.adjAmbientColor[1] < 0) {
|
||||
globalCtx->envCtx.adjAmbientColor[1] = 0;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[0][2] < 0) {
|
||||
globalCtx->envCtx.unk_8C[0][2] = 0;
|
||||
if (globalCtx->envCtx.adjAmbientColor[2] < 0) {
|
||||
globalCtx->envCtx.adjAmbientColor[2] = 0;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][0] < 0) {
|
||||
globalCtx->envCtx.unk_8C[2][0] = 0;
|
||||
if (globalCtx->envCtx.adjFogColor[0] < 0) {
|
||||
globalCtx->envCtx.adjFogColor[0] = 0;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][1] < 0) {
|
||||
globalCtx->envCtx.unk_8C[2][1] = 0;
|
||||
if (globalCtx->envCtx.adjFogColor[1] < 0) {
|
||||
globalCtx->envCtx.adjFogColor[1] = 0;
|
||||
}
|
||||
if (globalCtx->envCtx.unk_8C[2][2] < 0) {
|
||||
globalCtx->envCtx.unk_8C[2][2] = 0;
|
||||
if (globalCtx->envCtx.adjFogColor[2] < 0) {
|
||||
globalCtx->envCtx.adjFogColor[2] = 0;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue