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_schedule.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_schedule.c')
| -rw-r--r-- | src/code/z_schedule.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/code/z_schedule.c b/src/code/z_schedule.c index cfc6293ba..6a2492631 100644 --- a/src/code/z_schedule.c +++ b/src/code/z_schedule.c @@ -130,9 +130,9 @@ s32 Schedule_ReturnValueS(PlayState* play, u8** script, ScheduleOutput* output) s32 Schedule_CheckNotInSceneS(PlayState* play, u8** script, ScheduleOutput* output) { ScheduleCmdCheckNotInSceneS* cmd = (ScheduleCmdCheckNotInSceneS*)*script; - s16 scene = (cmd->sceneH << 8) | cmd->sceneL; + s16 sceneId = (cmd->sceneIdH << 8) | cmd->sceneIdL; - if (scene != play->sceneNum) { + if (sceneId != play->sceneId) { *script += cmd->offset; } @@ -141,9 +141,9 @@ s32 Schedule_CheckNotInSceneS(PlayState* play, u8** script, ScheduleOutput* outp s32 Schedule_CheckNotInSceneL(PlayState* play, u8** script, ScheduleOutput* output) { ScheduleCmdCheckNotInSceneL* cmd = (ScheduleCmdCheckNotInSceneL*)*script; - s16 scene = (cmd->sceneH << 8) | cmd->sceneL; + s16 sceneId = (cmd->sceneIdH << 8) | cmd->sceneIdL; - if (scene != play->sceneNum) { + if (sceneId != play->sceneId) { *script = *script + (s16)((cmd->offsetH << 8) | cmd->offsetL); } |