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

improve CS_INDEX_* naming, rem ENTRANCE suffix

Browse source 
https://github.com/zeldaret/oot/pull/2286#discussion_r1829165205

reverified with
> `check_format.py ...`
> `make ...`
This commit is contained in:
feacur 2024-11-05 12:28:41 +01:00
parent 8cbdf80d86
commit 2ec57c90a6
26 changed files with 185 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/z_parameter.c
View file

@ -644,8 +644,8 @@ void func_80083108(PlayState* play) {
s16 i;
s16 sp28 = false;
if ((gSaveContext.save.cutsceneIndex < CS_INDEX_ENTRANCE_4) ||
((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_ENTRANCE_4))) {
if ((gSaveContext.save.cutsceneIndex < CS_INDEX_0) ||
((play->sceneId == SCENE_LON_LON_RANCH) && (gSaveContext.save.cutsceneIndex == CS_INDEX_0))) {
gSaveContext.forceRisingButtonAlphas = false;
if ((player->stateFlags1 & PLAYER_STATE1_23) || (play->shootingGalleryStatus > 1) ||