diff options
| author | notyourav <65437533+notyourav@users.noreply.github.com> | 2022-02-01 22:09:53 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-01 22:09:53 -0800 |
| commit | 408fec16191e2a0bd25ab608607139b36c136719 (patch) | |
| tree | 25c00e60d7578ea6147f4e9e819ff3357aed5539 /src/enemy/vaatiWrath.c | |
| parent | dcc3ac219204e181117e366a1fb082c1ff4aabdd (diff) | |
| parent | 5ab94436796e846a40943d4e4117987a03ce2279 (diff) | |
Merge pull request #343 from octorock/wizzrobes
Decompile Wizzrobes
Diffstat (limited to 'src/enemy/vaatiWrath.c')
| -rw-r--r-- | src/enemy/vaatiWrath.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/enemy/vaatiWrath.c b/src/enemy/vaatiWrath.c index c4ac8b92..5ad9dd16 100644 --- a/src/enemy/vaatiWrath.c +++ b/src/enemy/vaatiWrath.c @@ -829,11 +829,11 @@ u32 sub_0804207C(Entity* this) { y = this->y.HALF.HI - 0x10; arm = ((VaatiWrathHeapStruct*)this->myHeap)->arms[0]; if ((arm != NULL) && (arm->action >= 5) && EntityWithinDistance(arm, x, y, 0x30)) { - return sub_080045D4(arm->x.HALF.HI, arm->y.HALF.HI, x, y); + return CalculateDirectionTo(arm->x.HALF.HI, arm->y.HALF.HI, x, y); } else { arm = ((VaatiWrathHeapStruct*)this->myHeap)->arms[1]; if (((arm != NULL) && (arm->action >= 5)) && EntityWithinDistance(arm, x, y, 0x30)) { - return sub_080045D4(arm->x.HALF.HI, arm->y.HALF.HI, x, y); + return CalculateDirectionTo(arm->x.HALF.HI, arm->y.HALF.HI, x, y); } else { if (gPlayerEntity.y.HALF.HI < 0x40) { tmp = gRoomControls.origin_y + 0x18; @@ -841,7 +841,7 @@ u32 sub_0804207C(Entity* this) { } else { tmp = gPlayerEntity.y.HALF.HI - 0x28; } - return sub_080045D4(this->x.HALF.HI, this->y.HALF.HI, gPlayerEntity.x.HALF.HI, tmp); + return CalculateDirectionTo(this->x.HALF.HI, this->y.HALF.HI, gPlayerEntity.x.HALF.HI, tmp); } } } |