diff options
| author | Derek Hensley <hensley.derek58@gmail.com> | 2021-07-28 19:26:40 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 22:26:40 -0400 |
| commit | 8e2f2b4cdb2b0ea7cc3588710ddb0a71f13eb4d9 (patch) | |
| tree | 4fa26cc9f21163d58b06dba0186c57de41423279 /include/z64object.h | |
| parent | b292647ea29e321649dbb9e52275f345157b16e8 (diff) | |
ovl en sob1 OK and Documented (#224)
* All but two match
* format
* Matched the last two functions
* Merge updates
* Bring data over as a comment
* Brought data over
* Cleanup and start documenting
* Documented
* Removed NON_MATCHING define
* Actually save the .h file
* Format and add items comment
* Add comment
* Add header to .c file
* Cleanup
* Rename EnSob1_GetGoodbyeBombShop
* Update items comment
* Final cleanup
* Rename InitialUpdate
* PR suggestions except enum for objIndices
* Add todo about objIndices index enum
* Change char to UNK_TYPE1 for padding
* Textures and convert weekEvents to hex
* PR suggestions
* Format
* Cleanup function declaration and add cutscene state enum
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
* Update src/overlays/actors/ovl_En_Sob1/z_en_sob1.c
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: Derek Hensley <d.hensley@tempered.io>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Diffstat (limited to 'include/z64object.h')
| -rw-r--r-- | include/z64object.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/z64object.h b/include/z64object.h index 659548b11..920a9e5dd 100644 --- a/include/z64object.h +++ b/include/z64object.h @@ -651,7 +651,8 @@ typedef enum { /* 0x27F */ OBJECT_LBFSHOT, /* 0x280 */ OBJECT_FUSEN, /* 0x281 */ OBJECT_ENDING_OBJ, - /* 0x282 */ OBJECT_GI_MASK13 + /* 0x282 */ OBJECT_GI_MASK13, + /* 0x283 */ OBJECT_ID_MAX } ObjectID; #endif |