Update packages/core/src/mm/actors/Player.c

Co-authored-by: ZoeyZolotova <[email protected]>
Aegiker · Oct 29, 2024 · 6cc65d4 · 6cc65d4
1 parent 45d66a7
commit 6cc65d4
Showing 1 changed file with 1 addition and 5 deletions.
diff --git a/packages/core/src/mm/actors/Player.c b/packages/core/src/mm/actors/Player.c
@@ -1961,11 +1961,7 @@ Actor* Player_FindGrottoNearPos(GameState_Play* play, Vec3f* refPos, f32 distanc
 /* This function hits all of the active colliders for all of the HakuginPost actors */
 /* This seems bad, but because these actors have a somewhat deranged check to make sure you're in front and facing it, I think this is okay. */
 void Player_HammerBonkHakuginPost(BgHakuginPost* hakuginPost) {
-    ActorOverlay* gActorOverlayTable = (ActorOverlay*)0x801aefd0;
-    void* hakuginPostOvlRamAddr = gActorOverlayTable[AC_BG_HAKUGIN_POST].loadedRamAddr;
-
-    if (hakuginPostOvlRamAddr != NULL) { /* Should be impossible for this to be NULL if you just hit a hakugin post with your Hammer, but... */
-        BgHakuginPostUnkStruct* hakuginPostCrazyStruct = hakuginPostOvlRamAddr + ((void*)0x80a9e028 - gActorOverlayTable[AC_BG_HAKUGIN_POST].vramStart);
+        BgHakuginPostUnkStruct* hakuginPostCrazyStruct = actorAddr(AC_BG_HAKUGIN_POST, 0x80a9e028);
         ColliderCylinder* collider;
         s32 i;