Merge branch 'mr-origin-89'

2024-10-08 02:06:56 -05:00
parent 680cf7a950 4bf7028254
commit 3cd3b3e5da
40 changed files with 709 additions and 585 deletions
--- a/src/core2/ba/marker.c
+++ b/src/core2/ba/marker.c
@@ -388,7 +388,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
                        return;
                    player_getPosition(spAC);
                    spAC[1] += 40.0f;
-                    if(func_802458E0(spAC, actor, 0x87) == 0)
+                    if(collisionTri_isHitFromAbove_actor(spAC, actor, 0x87) == 0)
                        return;
                    volatileFlag_set(VOLATILE_FLAG_1E, 1);
                    if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){