summaryrefslogtreecommitdiff
path: root/src/code/code_800430A0.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/code/code_800430A0.c')
-rw-r--r--src/code/code_800430A0.c39
1 files changed, 18 insertions, 21 deletions
diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c
index c03b84f3e..344c4ddb5 100644
--- a/src/code/code_800430A0.c
+++ b/src/code/code_800430A0.c
@@ -3,59 +3,56 @@
#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)
- {
+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)
+ if (actor->id == 0) {
((Player*)actor)->unk_83C += 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)
- {
+void func_80043334(CollisionContext* colCtx, Actor* actor, u32 floorPolySource) {
+ if (func_8003E934(floorPolySource) != 0) {
DynaPolyActor* dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
- if (dynaActor != NULL)
- {
+ if (dynaActor != NULL) {
func_800434A8(dynaActor);
- if ((actor->flags & 0x4000000) == 0x4000000)
+ if ((actor->flags & 0x4000000) == 0x4000000) {
func_80043538(dynaActor);
+ }
}
}
}
-s32 func_800433A4(CollisionContext* colCtx, u32 floorPolySource, Actor* actor)
-{
+s32 func_800433A4(CollisionContext* colCtx, u32 floorPolySource, Actor* actor) {
s32 sp24 = 0;
DynaPolyActor* dynaActor;
- if (func_8003E934(floorPolySource) == 0)
+ if (func_8003E934(floorPolySource) == 0) {
return 0;
+ }
- if ((colCtx->dyna.flags[floorPolySource] & 2) || !(colCtx->dyna.flags[floorPolySource] & 1))
+ if ((colCtx->dyna.flags[floorPolySource] & 2) || !(colCtx->dyna.flags[floorPolySource] & 1)) {
return 0;
+ }
dynaActor = DynaPolyInfo_GetActor(colCtx, floorPolySource);
- if (dynaActor == NULL)
+ if (dynaActor == NULL) {
return 0;
+ }
- if (dynaActor->unk_15C & 1)
- {
+ if (dynaActor->unk_15C & 1) {
func_800430A0(colCtx, floorPolySource, actor);
sp24 = 1;
}
- if (dynaActor->unk_15C & 2)
- {
+ if (dynaActor->unk_15C & 2) {
func_800432A0(colCtx, floorPolySource, actor);
sp24 = 1;
}