diff options
| author | cadmic <cadmic24@gmail.com> | 2024-11-11 14:50:56 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-11 17:50:56 -0500 |
| commit | d886ebe711360a52d15bf4b765c8542142d9e7c6 (patch) | |
| tree | b96bb7d12f286d7c491e4529d56177cff046e938 /src/code | |
| parent | 0d04f51e8ed53181fe0188715081c52ba6c841d0 (diff) | |
[ntsc-1.0/1.1] Match audio and loose ends (#2293)
* Match ntsc-1.0/1.1 loose ends
* Revert audioseq_padding
* Fix spelling
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_scene_table.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/code/z_scene_table.c b/src/code/z_scene_table.c index d9e238e75..d8386c688 100644 --- a/src/code/z_scene_table.c +++ b/src/code/z_scene_table.c @@ -1190,7 +1190,13 @@ void Scene_DrawConfigKokiriForest(PlayState* play) { spA3 = 255 - (u8)play->roomCtx.drawParams[0]; } else if (gSaveContext.sceneLayer == 6) { spA0 = play->roomCtx.drawParams[0] + 500; - } else if ((!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07)) { + } else if ( +#if OOT_VERSION < PAL_1_0 + !IS_CUTSCENE_LAYER && GET_EVENTCHKINF(EVENTCHKINF_07) +#else + (!IS_CUTSCENE_LAYER || LINK_IS_ADULT) && GET_EVENTCHKINF(EVENTCHKINF_07) +#endif + ) { spA0 = 2150; } |