diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2022-09-29 19:22:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-30 03:22:59 +0100 |
| commit | 3a723efb15c4d3e044edda7979b1cde5588c0aeb (patch) | |
| tree | 723be7198b5f4806ae3881841eb530e0767945ad /src/code/z_room.c | |
| parent | 08be0b3bd4f8c2e7955e94dd2714e1c8e4ef9594 (diff) | |
SceneNum -> SceneId (#1036)
* sceneNum -> sceneId
* horse data scene -> sceneId
* Clean up scene table
* format
* PR comments
* Some more
* It helps if you actually save the file
* PR
* Remove comment
* Format
* Conflicts
Diffstat (limited to 'src/code/z_room.c')
| -rw-r--r-- | src/code/z_room.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/code/z_room.c b/src/code/z_room.c index e0c2a035d..e198e95ed 100644 --- a/src/code/z_room.c +++ b/src/code/z_room.c @@ -111,8 +111,7 @@ s32 Room_HandleLoadCallbacks(PlayState* play, RoomContext* roomCtx) { func_80123140(play, GET_PLAYER(play)); Actor_SpawnTransitionActors(play, &play->actorCtx); - if (((play->sceneNum != SCENE_IKANA) || (roomCtx->curRoom.num != 1)) && - (play->sceneNum != SCENE_IKNINSIDE)) { + if (((play->sceneId != SCENE_IKANA) || (roomCtx->curRoom.num != 1)) && (play->sceneId != SCENE_IKNINSIDE)) { play->envCtx.lightSettingOverride = 0xFF; play->envCtx.unk_E0 = 0; } |