diff options
| author | Ibot02 <jtp.jtp@gmx.de> | 2022-01-02 14:55:56 +0100 |
|---|---|---|
| committer | Ibot02 <jtp.jtp@gmx.de> | 2022-01-02 14:55:56 +0100 |
| commit | ba7bb2e2cacbfd49563c33279766e217cb96b882 (patch) | |
| tree | 2bc0d466da129f97bc834879d4a24abd90ce5d60 /src/object | |
| parent | 3f790d80b490489eb619824e9767cef24f518744 (diff) | |
gyorgMale.c: new entity system
Diffstat (limited to 'src/object')
| -rw-r--r-- | src/object/gyorgBossObject.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/object/gyorgBossObject.c b/src/object/gyorgBossObject.c index 8a28f1ba..9647e4c6 100644 --- a/src/object/gyorgBossObject.c +++ b/src/object/gyorgBossObject.c @@ -20,7 +20,7 @@ void sub_080A1E54(GyorgBossObjectEntity*); void sub_080A1D8C(GyorgBossObjectEntity*, s32); void sub_080A1FF0(GyorgBossObjectEntity*); -u32 sub_080A20B8(GyorgBossObjectEntity*, GenericEntity*); +u32 sub_080A20B8(GyorgBossObjectEntity*, GyorgMaleEntity*); void sub_080A1D70(GyorgBossObjectEntity*, u32); void sub_080A1704(GyorgBossObjectEntity*); @@ -71,7 +71,7 @@ void sub_080A1704(GyorgBossObjectEntity* this) { tmp->y.HALF.HI = gRoomControls.roomOriginY + 0x330; #endif tmp->myHeap = heap; - heap->male1 = (GenericEntity*)tmp; + heap->male1 = (GyorgMaleEntity*)tmp; tmp = CreateEnemy(GYORG_MALE, 1); tmp->x.HALF.HI = gRoomControls.roomOriginX + 0x260; #ifdef EU @@ -80,7 +80,7 @@ void sub_080A1704(GyorgBossObjectEntity* this) { tmp->y.HALF.HI = gRoomControls.roomOriginY + 0x310; #endif tmp->myHeap = heap; - heap->male2 = (GenericEntity*)tmp; + heap->male2 = (GyorgMaleEntity*)tmp; gScreen.bg3.control = 0x1E07; gScreen.lcd.displayControl |= 0x800; this->unk_70 = 0; @@ -309,8 +309,8 @@ void sub_080A1D8C(GyorgBossObjectEntity* this, s32 unk1) { void sub_080A1DCC(GyorgBossObjectEntity* this) { GenericEntity* tmp; - if ((tmp = ((GyorgFemaleHeap*)super->myHeap)->male1) != NULL || - (tmp = ((GyorgFemaleHeap*)super->myHeap)->male2) != NULL) { + if ((tmp = (GenericEntity*)((GyorgFemaleHeap*)super->myHeap)->male1) != NULL || + (tmp = (GenericEntity*)((GyorgFemaleHeap*)super->myHeap)->male2) != NULL) { if (tmp->field_0x7c.BYTES.byte0 && tmp->base.spriteRendering.b3 == 2) { ((GyorgFemaleHeap*)super->myHeap)->unk_10->base.flags &= ~0x80; tmp = ((GyorgFemaleHeap*)super->myHeap)->unk_14; @@ -432,12 +432,12 @@ void sub_080A1FF0(GyorgBossObjectEntity* this) { } } -u32 sub_080A20B8(GyorgBossObjectEntity* this, GenericEntity* other) { +u32 sub_080A20B8(GyorgBossObjectEntity* this, GyorgMaleEntity* other) { if (other == NULL) { return 1; } if (sub_08079F8C() && gPlayerEntity.z.HALF.HI == 0) { - return other->field_0x7c.BYTES.byte0 == 0 && gPlayerState.field_0x14 != 0; + return other->unk_7c == 0 && gPlayerState.field_0x14 != 0; } return 0; } |