mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-13 03:14:38 +00:00
Code Issues Projects Releases Wiki Activity

code_80110450 (game over) OK* (#739)

Browse source 
* OK (sort of)

* remove hack

* clean up comments
This commit is contained in:
fig02 2021-03-28 19:50:46 -04:00 • committed by GitHub
parent 187d2d1500
commit 1639417327
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 209 additions and 444 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/code/z_play.c
View file

@ -229,7 +229,7 @@ void Gameplay_Init(GameState* thisx) {
Sram_Init(globalCtx, &globalCtx->sramCtx);
func_80112098(globalCtx);
func_80110F68(globalCtx);
func_80110450(globalCtx);
GameOver_Init(globalCtx);
func_8006BA00(globalCtx);
Effect_InitContext(globalCtx);
EffectSs_InitInfo(globalCtx, 0x55);
@ -771,7 +771,8 @@ void Gameplay_Update(GlobalContext* globalCtx) {
LOG_NUM("1", 1, "../z_play.c", 3542);
}
if ((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == 0) && (globalCtx->unk_10A20 == 0)) {
if ((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == 0) &&
(globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE)) {
KaleidoSetup_Update(globalCtx);
}
@ -935,12 +936,12 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
KaleidoScopeCall_Update(globalCtx);
} else if (globalCtx->unk_10A20 != 0) {
} else if (globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, "../z_play.c", 3727);
}
func_801104C8(globalCtx);
GameOver_Update(globalCtx);
} else {
if (1 && HREG(63)) {
LOG_NUM("1", 1, "../z_play.c", 3733);
@ -1028,7 +1029,7 @@ skip:
}
func_80070C24(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx,
&globalCtx->unk_10A20, globalCtx->state.gfxCtx);
&globalCtx->gameOverCtx, globalCtx->state.gfxCtx);
}
void Gameplay_DrawOverlayElements(GlobalContext* globalCtx) {
@ -1042,8 +1043,8 @@ void Gameplay_DrawOverlayElements(GlobalContext* globalCtx) {
func_8010F58C(globalCtx);
if (globalCtx->unk_10A20 != 0) {
func_80110460(globalCtx);
if (globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) {
GameOver_FadeInLights(globalCtx);
}
}