diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-03-06 22:36:16 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-06 22:36:16 -0800 |
| commit | 4e94e1fbc321b8d98da0f55624b46cfcc6a415a0 (patch) | |
| tree | 2c3d937449c6f4e60cfa492b4e07ce2dc2fb2788 /src/enemy | |
| parent | 80f9adac2009bbc774a463e1828884c1fbcf3e6f (diff) | |
| parent | abb02729633091d8f02efda99a9cbb8b71674e89 (diff) | |
Merge pull request #433 from octorock/objectUtils
Decompile rest of objectUtils
Diffstat (limited to 'src/enemy')
| -rw-r--r-- | src/enemy/bladeTrap.c | 4 | ||||
| -rw-r--r-- | src/enemy/bombarossa.c | 4 | ||||
| -rw-r--r-- | src/enemy/lakituCloud.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/enemy/bladeTrap.c b/src/enemy/bladeTrap.c index f5531def..d534242a 100644 --- a/src/enemy/bladeTrap.c +++ b/src/enemy/bladeTrap.c @@ -14,7 +14,7 @@ void BladeTrap(Entity* this) { if (this->action == 0) { this->action = 1; this->child = GetCurrentRoomProperty(this->type); - sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD); + sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD); } if (!(this->direction & 0x80)) { LinearMoveUpdate(this); @@ -24,6 +24,6 @@ void BladeTrap(Entity* this) { if (!(this->direction & 0x80)) { EnqueueSFX(SFX_METAL_CLINK); } - sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD); + sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD); } } diff --git a/src/enemy/bombarossa.c b/src/enemy/bombarossa.c index f3455a21..4004edb5 100644 --- a/src/enemy/bombarossa.c +++ b/src/enemy/bombarossa.c @@ -27,7 +27,7 @@ void Bombarossa_OnTick(BombarossaEntity* this) { InitializeAnimation(super, 0); if (super->type != 0) { super->child = GetCurrentRoomProperty(super->type); - sub_080A2CC0(super, &super->child, &this->unk_0x76); + sub_080A2CC0(super, (u16**)&super->child, &this->unk_0x76); } } @@ -68,7 +68,7 @@ void sub_0803350C(BombarossaEntity* this) { } if (--this->unk_0x76 == 0) { - sub_080A2CC0(super, &super->child, &this->unk_0x76); + sub_080A2CC0(super, (u16**)&super->child, &this->unk_0x76); } } diff --git a/src/enemy/lakituCloud.c b/src/enemy/lakituCloud.c index dda0a902..25616556 100644 --- a/src/enemy/lakituCloud.c +++ b/src/enemy/lakituCloud.c @@ -118,7 +118,7 @@ void sub_0803CDD8(Entity* this) { void sub_0803CE14(Entity* this) { u8 direction; - sub_080A2CC0(this, &this->child, &this->field_0x74.HWORD); + sub_080A2CC0(this, (u16**)&this->child, &this->field_0x74.HWORD); direction = this->direction; if (direction & 0x80) { |