mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 16:30:19 +00:00
Code Issues Projects Releases Wiki Activity

Decompile z_kankyo (#956)

Browse source 
* 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:
petrie911 2021-09-20 11:51:35 -05:00 • committed by GitHub
parent 50095d427c
commit e51f50f0ff
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
139 changed files with 3478 additions and 6277 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -181,28 +181,28 @@ void EnBom_Explode(EnBom* this, GlobalContext* globalCtx) {
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->explosionCollider.base);
}
if (globalCtx->envCtx.unk_8C[1][0] != 0) {
globalCtx->envCtx.unk_8C[1][0] -= 0x19;
if (globalCtx->envCtx.adjLight1Color[0] != 0) {
globalCtx->envCtx.adjLight1Color[0] -= 25;
}
if (globalCtx->envCtx.unk_8C[1][1] != 0) {
globalCtx->envCtx.unk_8C[1][1] -= 0x19;
if (globalCtx->envCtx.adjLight1Color[1] != 0) {
globalCtx->envCtx.adjLight1Color[1] -= 25;
}
if (globalCtx->envCtx.unk_8C[1][2] != 0) {
globalCtx->envCtx.unk_8C[1][2] -= 0x19;
if (globalCtx->envCtx.adjLight1Color[2] != 0) {
globalCtx->envCtx.adjLight1Color[2] -= 25;
}
if (globalCtx->envCtx.unk_8C[0][0] != 0) {
globalCtx->envCtx.unk_8C[0][0] -= 0x19;
if (globalCtx->envCtx.adjAmbientColor[0] != 0) {
globalCtx->envCtx.adjAmbientColor[0] -= 25;
}
if (globalCtx->envCtx.unk_8C[0][1] != 0) {
globalCtx->envCtx.unk_8C[0][1] -= 0x19;
if (globalCtx->envCtx.adjAmbientColor[1] != 0) {
globalCtx->envCtx.adjAmbientColor[1] -= 25;
}
if (globalCtx->envCtx.unk_8C[0][2] != 0) {
globalCtx->envCtx.unk_8C[0][2] -= 0x19;
if (globalCtx->envCtx.adjAmbientColor[2] != 0) {
globalCtx->envCtx.adjAmbientColor[2] -= 25;
}
if (this->timer == 0) {
@ -315,8 +315,13 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
Audio_PlayActorSound2(thisx, NA_SE_IT_BOMB_EXPLOSION);
globalCtx->envCtx.unk_8C[1][0] = globalCtx->envCtx.unk_8C[1][1] = globalCtx->envCtx.unk_8C[1][2] = 0xFA;
globalCtx->envCtx.unk_8C[0][0] = globalCtx->envCtx.unk_8C[0][1] = globalCtx->envCtx.unk_8C[0][2] = 0xFA;
globalCtx->envCtx.adjLight1Color[0] = globalCtx->envCtx.adjLight1Color[1] =
globalCtx->envCtx.adjLight1Color[2] = 250;
globalCtx->envCtx.adjAmbientColor[0] = globalCtx->envCtx.adjAmbientColor[1] =
globalCtx->envCtx.adjAmbientColor[2] = 250;
Camera_AddQuake(&globalCtx->mainCamera, 2, 0xB, 8);
thisx->params = BOMB_EXPLOSION;
this->timer = 10;