mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-12 02:44:54 +00:00
Code Issues Projects Releases Wiki Activity

[ntsc-1.2] Match z_game_over.c, PAL 1.1 fixes (#2099)

Browse source 
* Match z_game_over.c (PAL 1.1 change)

* Fix previous matches that are actually PAL 1.1 changes

* Add versions.h to global.h

* Add versions.h to z_game_over.c too

* And the others too

* Fix awkward wording
This commit is contained in:
cadmic 2024-08-28 18:00:06 -07:00 • committed by GitHub
parent 16ec9b1e13
commit 6e8b820184
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/code/z_game_over.c
View file

@ -1,6 +1,7 @@
#include "z64game_over.h"
#include "global.h"
#include "versions.h"
void GameOver_Init(PlayState* play) {
play->gameOverCtx.state = GAMEOVER_INACTIVE;
@ -61,7 +62,12 @@ void GameOver_Update(PlayState* play) {
}
}
#if OOT_VERSION < PAL_1_1
gSaveContext.nayrusLoveTimer = 0;
#else
gSaveContext.nayrusLoveTimer = 2000;
#endif
gSaveContext.save.info.playerData.naviTimer = 0;
gSaveContext.seqId = (u8)NA_BGM_DISABLED;
gSaveContext.natureAmbienceId = NATURE_ID_DISABLED;