diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2024-04-22 21:34:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-22 18:34:02 -0700 |
| commit | 76fadbd0e9e041a35b483b10d352e7e738b38b58 (patch) | |
| tree | 1fed717b91a1671bcf490fc26c5e1b9ec56a6195 /src/code/z_sub_s.c | |
| parent | 5143cc4d0d97ab0e0fc2b1333b369bedb0994f21 (diff) | |
`ovl_En_Door` docs pass (#1603)
* DoorScheduleResult
* actionVar
* DOOR_DL_
* enums
* ENDOOR_TYPE_SCHEDULE and related stuff
* Name some functions and start figuring out stuff
* defines
* start documenting schedules
* Name Inn doors
* More door schedule naming
* ajar
* Name remaining schedule types
* parameters diagram and some cleanups
* Name renaiming types
* format
* rename some schedules
* Use more static_assert
* name anims
* yeet unrelated stuff
* requestOpen
* Yeet DoorScheduleResult
* whoops
* stuff i missed
* Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Door/z_en_door.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Door/z_en_door.h
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* Update src/overlays/actors/ovl_En_Pm/z_en_pm.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/code/z_sub_s.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
* FindScheduleDoor
---------
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Diffstat (limited to 'src/code/z_sub_s.c')
| -rw-r--r-- | src/code/z_sub_s.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/code/z_sub_s.c b/src/code/z_sub_s.c index 7117e1da2..11f97c7d0 100644 --- a/src/code/z_sub_s.c +++ b/src/code/z_sub_s.c @@ -15,9 +15,10 @@ Vec3f gOneVec3f = { 1.0f, 1.0f, 1.0f }; s32 D_801C5DBC[] = { 0, 1 }; // Unused /** - * Finds the first EnDoor instance with doorType == ENDOOR_TYPE_5 and the specified switchFlag. + * Finds the first EnDoor instance of type `ENDOOR_TYPE_SCHEDULE` and the specified schType (a value from the + * EnDoorScheduleType enum). */ -EnDoor* SubS_FindDoor(PlayState* play, s32 switchFlag) { +EnDoor* SubS_FindScheduleDoor(PlayState* play, s32 schType) { Actor* actor = NULL; EnDoor* door; @@ -29,7 +30,7 @@ EnDoor* SubS_FindDoor(PlayState* play, s32 switchFlag) { break; } - if ((door->doorType == ENDOOR_TYPE_5) && (door->switchFlag == (u8)switchFlag)) { + if ((door->doorType == ENDOOR_TYPE_SCHEDULE) && (door->typeVar.schType == (u8)schType)) { break; } |