diff options
| author | Jordan Longstaff <JordanLongstaff@users.noreply.github.com> | 2024-12-20 18:26:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-20 18:26:42 -0500 |
| commit | dd11751b43894fc51772393825f6971eaa38b773 (patch) | |
| tree | 0da1713e485c5cc45dac9afb9749d11b2e81890d /soh/include | |
| parent | 35e0a7ce10ce6ad2406b0306d74e045df99237d8 (diff) | |
Rename `code_80043480.c` from decomp (#4731)
Diffstat (limited to 'soh/include')
| -rw-r--r-- | soh/include/functions.h | 18 | ||||
| -rw-r--r-- | soh/include/z64actor.h | 11 |
2 files changed, 18 insertions, 11 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h index d4b47b60c..64d7026e1 100644 --- a/soh/include/functions.h +++ b/soh/include/functions.h @@ -717,15 +717,15 @@ void BgCheck_DrawStaticCollision(PlayState*, CollisionContext*); void func_80043334(CollisionContext* colCtx, Actor* actor, s32 bgId); s32 func_800433A4(CollisionContext* colCtx, s32 bgId, Actor* actor); void DynaPolyActor_Init(DynaPolyActor* dynaActor, s32 flags); -void func_800434A0(DynaPolyActor* dynaActor); -void func_800434A8(DynaPolyActor* dynaActor); -void func_800434C8(CollisionContext* colCtx, s32 floorBgId); -void func_80043508(CollisionContext* colCtx, s32 floorBgId); -void func_80043538(DynaPolyActor* dynaActor); -s32 func_80043548(DynaPolyActor* dynaActor); -s32 func_8004356C(DynaPolyActor* dynaActor); -s32 func_80043590(DynaPolyActor* dynaActor); -s32 func_800435B4(DynaPolyActor* dynaActor); +void DynaPolyActor_UnsetAllInteractFlags(DynaPolyActor* dynaActor); +void DynaPolyActor_SetActorOnTop(DynaPolyActor* dynaActor); +void DynaPoly_SetPlayerOnTop(CollisionContext* colCtx, s32 floorBgId); +void DynaPoly_SetPlayerAbove(CollisionContext* colCtx, s32 floorBgId); +void DynaPolyActor_SetSwitchPressed(DynaPolyActor* dynaActor); +s32 DynaPolyActor_IsActorOnTop(DynaPolyActor* dynaActor); +s32 DynaPolyActor_IsPlayerOnTop(DynaPolyActor* dynaActor); +s32 DynaPolyActor_IsPlayerAbove(DynaPolyActor* dynaActor); +s32 DynaPolyActor_IsSwitchPressed(DynaPolyActor* dynaActor); s32 func_800435D8(PlayState* play, DynaPolyActor* dynaActor, s16 arg2, s16 arg3, s16 arg4); void Camera_Init(Camera* camera, View* view, CollisionContext* colCtx, PlayState* play); void Camera_InitPlayerSettings(Camera* camera, Player* player); diff --git a/soh/include/z64actor.h b/soh/include/z64actor.h index 156f1d679..5d6bfc26b 100644 --- a/soh/include/z64actor.h +++ b/soh/include/z64actor.h @@ -214,6 +214,13 @@ if neither of the above are set : blue 0x2000 : translucent, else opaque */ +#define DYNA_INTERACT_ACTOR_ON_TOP (1 << 0) // There is an actor standing on the collision of the dynapoly actor +#define DYNA_INTERACT_PLAYER_ON_TOP (1 << 1) // The player actor is standing on the collision of the dynapoly actor +#define DYNA_INTERACT_PLAYER_ABOVE \ + (1 << 2) // The player is directly above the collision of the dynapoly actor (any distance above) +#define DYNA_INTERACT_ACTOR_SWITCH_PRESSED \ + (1 << 3) // An actor that is capable of pressing switches is on top of the dynapoly actor + typedef struct DynaPolyActor { /* 0x000 */ struct Actor actor; /* 0x14C */ s32 bgId; @@ -221,8 +228,8 @@ typedef struct DynaPolyActor { /* 0x154 */ f32 unk_154; /* 0x158 */ s16 unk_158; // y rotation? /* 0x15A */ u16 unk_15A; - /* 0x15C */ u32 unk_15C; - /* 0x160 */ u8 unk_160; + /* 0x15C */ u32 transformFlags; + /* 0x160 */ u8 interactFlags; /* 0x162 */ s16 unk_162; } DynaPolyActor; // size = 0x164 |