mirror of
https://github.com/zeldaret/oot
synced 2026-06-26 18:32:00 -04:00
174af7384d
* cleanup libultra * fixes - use quotes instead of <> for includes - add macros for zelda specific thread priorities - fix Makefile - properly format the remaining pfs structs * fix button macros + add CHECK_BTN_ANY/CHECK_BTN_ALL * remove ULTRA_ABS * fix includes * update z_player.c/z_lib.c + run format.sh * merge upstream/master * fix include in En_Goroiwa * fix includes
61 lines
1.6 KiB
C
61 lines
1.6 KiB
C
#include "global.h"
|
|
|
|
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800430A0/func_800430A0.s")
|
|
|
|
void func_800432A0(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) {
|
|
if (func_8003E934(floorPolySource) != 0) {
|
|
s16 v1 = colCtx->dyna.actorMeshArr[floorPolySource].rot2.y - colCtx->dyna.actorMeshArr[floorPolySource].rot1.y;
|
|
|
|
if (actor->id == 0) {
|
|
((Player*)actor)->currentYaw += v1;
|
|
}
|
|
|
|
actor->shape.rot.y += v1;
|
|
actor->posRot.rot.y += v1;
|
|
}
|
|
}
|
|
|
|
void func_80043334(CollisionContext* colCtx, Actor* actor, u32 floorPolySource) {
|
|
if (func_8003E934(floorPolySource) != 0) {
|
|
DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
|
|
if (dynaActor != NULL) {
|
|
func_800434A8(dynaActor);
|
|
|
|
if ((actor->flags & 0x4000000) == 0x4000000) {
|
|
func_80043538(dynaActor);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
s32 func_800433A4(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) {
|
|
s32 sp24 = 0;
|
|
DynaPolyActor* dynaActor;
|
|
|
|
if (func_8003E934(floorPolySource) == 0) {
|
|
return 0;
|
|
}
|
|
|
|
if ((colCtx->dyna.flags[floorPolySource] & 2) || !(colCtx->dyna.flags[floorPolySource] & 1)) {
|
|
return 0;
|
|
}
|
|
|
|
dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
|
|
|
|
if (dynaActor == NULL) {
|
|
return 0;
|
|
}
|
|
|
|
if (dynaActor->unk_15C & 1) {
|
|
func_800430A0(colCtx, floorPolySource, actor);
|
|
sp24 = 1;
|
|
}
|
|
|
|
if (dynaActor->unk_15C & 2) {
|
|
func_800432A0(colCtx, floorPolySource, actor);
|
|
sp24 = 1;
|
|
}
|
|
|
|
return sp24;
|
|
}
|