diff --git a/config/SOUE01/symbols.txt b/config/SOUE01/symbols.txt index 0030142f..0c6f28f2 100644 --- a/config/SOUE01/symbols.txt +++ b/config/SOUE01/symbols.txt @@ -1060,7 +1060,7 @@ getParams2Lower__9dAcBase_cFv = .text:0x8002D010; // type:function size:0xC findActor__9dAcBase_cFPcP9dAcBase_c = .text:0x8002D020; // type:function size:0x74 searchActor__9dAcBase_cFP9dAcBase_c = .text:0x8002D0A0; // type:function size:0x88 forEveryActor__9dAcBase_cFPFP9dAcBase_cP9dAcBase_c_PvP9dAcBase_c = .text:0x8002D130; // type:function size:0x5C -getXZAngleToPlayer__9dAcBase_cFPs = .text:0x8002D190; // type:function size:0x3C +getXZAngleToPlayer__9dAcBase_cFv = .text:0x8002D190; // type:function size:0x3C getDistanceToActor__9dAcBase_cFP9dAcBase_cfPf = .text:0x8002D1D0; // type:function size:0xB8 getDistanceAndAngleToActor__9dAcBase_cFP9dAcBase_cfssPfPsPs = .text:0x8002D290; // type:function size:0x148 isWithinPlayerRadius__9dAcBase_cCFf = .text:0x8002D3E0; // type:function size:0x5C diff --git a/include/d/a/d_a_base.h b/include/d/a/d_a_base.h index ebce49a6..346c68a4 100644 --- a/include/d/a/d_a_base.h +++ b/include/d/a/d_a_base.h @@ -148,8 +148,7 @@ class dAcBase_c : public dBase_c { /* 8002d0a0 */ static dAcBase_c *searchActor(dAcBase_c *parent); // Kinda performs the code of the first param on every actor (second param is optional parent) /* 8002d130 */ static void forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *parent); - // Not really static, but we currently dont have a type for the return (not just simply a s16) - /* 8002d190 */ mAng getXZAngleToPlayer(s16 *angle); + /* 8002d190 */ mAng getXZAngleToPlayer(); // returns true if under the distThresh, False if not. the actual distance is returned in outDist /* 8002d1d0 */ bool getDistanceToActor(dAcBase_c *actor, f32 distThresh, f32 *outDist); // same concept as above diff --git a/src/d/a/d_a_base.cpp b/src/d/a/d_a_base.cpp index ce0c7e61..0ebbe74c 100644 --- a/src/d/a/d_a_base.cpp +++ b/src/d/a/d_a_base.cpp @@ -327,7 +327,7 @@ void dAcBase_c::forEveryActor(void *func(dAcBase_c *, dAcBase_c *), dAcBase_c *p } // 8002d190 -mAng dAcBase_c::getXZAngleToPlayer(s16 *angle) { +mAng dAcBase_c::getXZAngleToPlayer() { return targetAngleY(&this->position, &dPlayer::LINK->position); }