diff options
| author | Synray <31429825+Synray@users.noreply.github.com> | 2022-11-03 17:42:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-03 21:42:27 -0300 |
| commit | baaa79b979e446afa8ff16dca83b07a58b9dce6a (patch) | |
| tree | f5b20220a5ea87ebfb56b692bef36a072b420ad3 /include | |
| parent | 38c9ffe445ed090ad27ed0a9bd6d6ebb7cf55ec3 (diff) | |
ovl_En_Kaizoku OK (#945)
* ovl_En_Kaizoku OK
* format.sh
* Review changes
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
* Fix building
* first pass
* picto
* format
* object
* sfx
* morecleanup
* and more naming
* boyo
* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* review
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
* Update src/overlays/actors/ovl_En_Kaizoku/z_en_kaizoku.c
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* Review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* review
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
* floats
* steal some docs from OoT
* review
* format
* sort
* parens
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: Isghj <42048411+isghj5@users.noreply.github.com>
Co-authored-by: angie <angheloalf95@gmail.com>
Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/z64collision_check.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/include/z64collision_check.h b/include/z64collision_check.h index 434b74a3a..836fd3555 100644 --- a/include/z64collision_check.h +++ b/include/z64collision_check.h @@ -283,16 +283,16 @@ typedef enum { } ColChkMassType; typedef enum { - /* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark - /* 1 */ COLTYPE_HIT1, // No blood, dust hitmark - /* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark - /* 3 */ COLTYPE_HIT3, // No blood, white hitmark - /* 4 */ COLTYPE_HIT4, // Water burst, no hitmark - /* 5 */ COLTYPE_HIT5, // No blood, red hitmark - /* 6 */ COLTYPE_HIT6, // Green blood, white hitmark - /* 7 */ COLTYPE_HIT7, // Red blood, white hitmark - /* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark - /* 9 */ COLTYPE_METAL, + /* 0 */ COLTYPE_HIT0, // Blue blood, white hitmark + /* 1 */ COLTYPE_HIT1, // No blood, dust hitmark + /* 2 */ COLTYPE_HIT2, // Green blood, dust hitmark + /* 3 */ COLTYPE_HIT3, // No blood, white hitmark + /* 4 */ COLTYPE_HIT4, // Water burst, no hitmark + /* 5 */ COLTYPE_HIT5, // No blood, red hitmark + /* 6 */ COLTYPE_HIT6, // Green blood, white hitmark + /* 7 */ COLTYPE_HIT7, // Red blood, white hitmark + /* 8 */ COLTYPE_HIT8, // Blue blood, red hitmark + /* 9 */ COLTYPE_METAL, /* 10 */ COLTYPE_NONE, /* 11 */ COLTYPE_WOOD, /* 12 */ COLTYPE_HARD, |