diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-07-23 11:16:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-23 11:16:08 -0700 |
| commit | ccba86d292a0e4c8a0e07325ac4fb25e5a58dc89 (patch) | |
| tree | fbe0b96a06f46a457e7c4ed54fa889d82746879b /src/object/object64.c | |
| parent | aabd340b51c818bc5c46017298b59747be2e4bf6 (diff) | |
| parent | 461841290a4f8f85bae303e0d2f4315830b34c6e (diff) | |
Merge pull request #536 from hatal175/various
Diffstat (limited to 'src/object/object64.c')
| -rw-r--r-- | src/object/object64.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/object/object64.c b/src/object/object64.c index d1d6f62e..e0f20c1e 100644 --- a/src/object/object64.c +++ b/src/object/object64.c @@ -20,7 +20,7 @@ void sub_08093ED0(Object64Entity*); void sub_08093EF0(Object64Entity*); typedef struct { - u16 unk_0; + u16 sfx; u8 unk_2; u8 unk_3; } struct_08122950; @@ -40,7 +40,7 @@ void Object64(Object64Entity* this) { } void sub_08093E3C(Object64Entity* this) { - const u16* ptr; + const struct_08122950* ptr; super->action = 1; super->flags &= 0x7f; super->spriteSettings.draw = 1; @@ -48,9 +48,9 @@ void sub_08093E3C(Object64Entity* this) { ResolveCollisionLayer(super); } InitializeAnimation(super, super->type); - ptr = &gUnk_08122950[super->type].unk_0; - if ((ptr[0] != 0) && ((super->type2 & 0x40) == 0)) { - EnqueueSFX(ptr[0]); + ptr = &gUnk_08122950[super->type]; + if ((ptr->sfx != SFX_NONE) && ((super->type2 & 0x40) == 0)) { + EnqueueSFX(ptr->sfx); } if ((super->type2 & 0x20) != 0) { super->spriteRendering.b3 = 1; |