diff options
| author | cadmic <cadmic24@gmail.com> | 2024-08-28 18:00:06 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-28 21:00:06 -0400 |
| commit | 6e8b8201840d905e38bb15fbc9301504748abf4f (patch) | |
| tree | 44802e4c21b28da5429c2e2ac9bbeb654841cd23 /src/code | |
| parent | 16ec9b1e13abca7ef2a978bd1b99935f2dd3b2ab (diff) | |
[ntsc-1.2] Match z_game_over.c, PAL 1.1 fixes (#2099)
* 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
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_game_over.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/code/z_game_over.c b/src/code/z_game_over.c index ff2f2a57d..e6335307d 100644 --- a/src/code/z_game_over.c +++ b/src/code/z_game_over.c @@ -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; |