From e2050f2eb8af400e066a9ca94839934294432ae0 Mon Sep 17 00:00:00 2001 From: Tal Hayon Date: Mon, 25 Jul 2022 19:49:16 +0300 Subject: [PATCH] Minor corrections in sub_0802D3B8 nonmatching --- src/enemy/gleerok.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/enemy/gleerok.c b/src/enemy/gleerok.c index 7f34d511..bdafc0a8 100644 --- a/src/enemy/gleerok.c +++ b/src/enemy/gleerok.c @@ -283,10 +283,9 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE uvar1 = 0; do { - ent = CreateEnemy(GLEEROK, 1); - super->child = ent; - if (ent != NULL) { - ent->type2 = uvar1 + 1; + super->child = CreateEnemy(GLEEROK, 1); + if (super->child != NULL) { + super->child->type2 = uvar1 + 1; super->child->collisionLayer = super->collisionLayer; super->child->x.HALF.HI = super->x.HALF.HI; super->child->y.HALF.HI = super->y.HALF.HI + ((uvar1 + 1) * 12); @@ -310,7 +309,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE super->child->parent = super; ((GleerokEntity*)super->child)->unk_84 = this->unk_84; heap->ent2 = super->child; - heap->filler[3].unk1 = 0x10; + heap->filler[5].unk1 = 0x10; heap->filler[11].unk1 = 0; heap->filler[13].unk1 = 0; } @@ -324,9 +323,7 @@ NONMATCH("asm/non_matching/gleerok/sub_0802D3B8.inc", void sub_0802D3B8(GleerokE COLLISION_ON(super); super->flags2 |= 0x80; } - ptr = gUnk_080CD7C4; - ptr += super->type2; - super->spritePriority.b0 = ptr->unk1; + super->spritePriority.b0 = gUnk_080CD7C4[super->type2].unk1; super->subtimer = 0; InitializeAnimation(super, 0x24); break;