diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-07-31 21:22:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-31 21:22:55 +0200 |
| commit | 82f54b2f075e7f6612b80edf52b37bb6377e0d49 (patch) | |
| tree | 93550aa10732bc050088b5773ce3ea0d09f6e0dc /src/00_Core/Actor/Actor.cpp | |
| parent | 8ad6359c7d3c7afcbddd7d450b7fa4b9764255b6 (diff) | |
EquipBombchu (#131)
* Map symbol in Game
* EquipBombchu 12%
* EquipBombchu 53%
* EquipBombchu 71%
* configure: Don't verify dsd version if `--dsd` specified
* EquipBombchu 89%
* Fix regression
Diffstat (limited to 'src/00_Core/Actor/Actor.cpp')
| -rw-r--r-- | src/00_Core/Actor/Actor.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/00_Core/Actor/Actor.cpp b/src/00_Core/Actor/Actor.cpp index 47d5e3d6..c2a0f06c 100644 --- a/src/00_Core/Actor/Actor.cpp +++ b/src/00_Core/Actor/Actor.cpp @@ -15,6 +15,7 @@ extern "C" { #include "Player/PlayerLinkBase.hpp" #include "Player/TouchControl.hpp" #include "Save/AdventureFlags.hpp" +#include "Unknown/UnkStruct_ov000_020e9c88.hpp" static char *sShipTypes[] = {"brg", "anc", "bow", "hul", "can", "dco", "pdl", "fnl"}; @@ -491,7 +492,7 @@ ARM bool Actor::CollidesWithShield(Cylinder *param1) { Vec3p vecFromPlayer; Vec3p_Sub(&mPos, &gPlayerPos, &vecFromPlayer); s32 currAngle = gPlayerAngle; - s32 angle = Atan2(vecFromPlayer.x, vecFromPlayer.z); + s32 angle = FX_Atan2Idx(vecFromPlayer.x, vecFromPlayer.z); s32 angleDiff = (s16) angle - currAngle; if (angleDiff < 0) { angleDiff = -angleDiff; @@ -705,7 +706,7 @@ ARM s16 Actor::GetAngleTo(Vec3p *vec) { q20 dz = vec->z - mPos.z; q20 dx = vec->x - mPos.x; if (dx != 0 || dz != 0) { - angle = Atan2(dx, dz); + angle = FX_Atan2Idx(dx, dz); } return angle; } @@ -973,11 +974,9 @@ ARM void Actor::KillInBounds() { this->Kill(); } -extern unk32 data_ov00_020e9c88; -extern "C" void func_ov00_0207b89c(unk32 *param1, s32 param2, Vec3p *param3, void *param4, Actor *param5); void vfunc_ac_Thunk(Actor *actor); ARM void Actor::func_ov00_020c31c0(unk32 param1) { - func_ov00_0207b89c(&data_ov00_020e9c88, param1, &mPos, &vfunc_ac_Thunk, this); + data_ov000_020e9c88.func_ov000_0207b89c(param1, &mPos, (void (*)(void *)) &vfunc_ac_Thunk, this); } ARM void vfunc_ac_Thunk(Actor *actor) { |