mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-18 07:25:39 -04:00
Code Issues Packages 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
139 changed files with 3478 additions and 6277 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_game_over.c
+4 -4
View File
@@ -9,7 +9,7 @@ void GameOver_FadeInLights(GlobalContext* globalCtx) {
if ((gameOverCtx->state >= GAMEOVER_DEATH_WAIT_GROUND && gameOverCtx->state < GAMEOVER_REVIVE_START) ||
(gameOverCtx->state >= GAMEOVER_REVIVE_RUMBLE && gameOverCtx->state < GAMEOVER_REVIVE_FADE_OUT)) {
Kankyo_FadeInGameOverLights(globalCtx);
Environment_FadeInGameOverLights(globalCtx);
}
}
@@ -74,7 +74,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
gSaveContext.buttonStatus[3] = gSaveContext.buttonStatus[4] = BTN_ENABLED;
gSaveContext.unk_13E7 = gSaveContext.unk_13E8 = gSaveContext.unk_13EA = gSaveContext.unk_13EC = 0;
Kankyo_InitGameOverLights(globalCtx);
Environment_InitGameOverLights(globalCtx);
D_80153D80 = 20;
if (1) {}
v90 = VREG(90);
@@ -103,7 +103,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
case GAMEOVER_REVIVE_START:
gameOverCtx->state++;
D_80153D80 = 0;
Kankyo_InitGameOverLights(globalCtx);
Environment_InitGameOverLights(globalCtx);
ShrinkWindow_SetVal(0x20);
return;
@@ -139,7 +139,7 @@ void GameOver_Update(GlobalContext* globalCtx) {
break;
case GAMEOVER_REVIVE_FADE_OUT:
Kankyo_FadeOutGameOverLights(globalCtx);
Environment_FadeOutGameOverLights(globalCtx);
D_80153D80--;
if (D_80153D80 == 0) {