diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-10-23 12:48:01 +1100 |
|---|---|---|
| committer | Eblo <7004497+Eblo@users.noreply.github.com> | 2025-09-16 12:49:28 -0400 |
| commit | 86fe605c376b37a6c1758be375fcd99cfe53a578 (patch) | |
| tree | d6cae58d0e7a78c6324db4afe1e7f830a66566a2 /mm/src/code | |
| parent | 0109beff5d5f20f2653d4b436295e50fe96608e6 (diff) | |
dyna switches (#1731)
Diffstat (limited to 'mm/src/code')
| -rw-r--r-- | mm/src/code/z_bg_collect.c | 8 | ||||
| -rw-r--r-- | mm/src/code/z_bg_item.c | 12 | ||||
| -rw-r--r-- | mm/src/code/z_player_call.c | 2 |
3 files changed, 11 insertions, 11 deletions
diff --git a/mm/src/code/z_bg_collect.c b/mm/src/code/z_bg_collect.c index e4a6072ce..717c6e0ed 100644 --- a/mm/src/code/z_bg_collect.c +++ b/mm/src/code/z_bg_collect.c @@ -72,11 +72,11 @@ void DynaPolyActor_AttachCarriedActor(CollisionContext* colCtx, Actor* carriedAc if (dynaActor != NULL) { DynaPolyActor_SetActorOnTop(dynaActor); - if (CHECK_FLAG_ALL(carriedActor->flags, ACTOR_FLAG_CAN_PRESS_SWITCH)) { - DynaPolyActor_SetActorOnSwitch(dynaActor); + if (CHECK_FLAG_ALL(carriedActor->flags, ACTOR_FLAG_CAN_PRESS_SWITCHES)) { + DynaPolyActor_SetSwitchPressed(dynaActor); } - if (CHECK_FLAG_ALL(carriedActor->flags, ACTOR_FLAG_CAN_PRESS_HEAVY_SWITCH)) { - DynaPolyActor_SetActorOnHeavySwitch(dynaActor); + if (CHECK_FLAG_ALL(carriedActor->flags, ACTOR_FLAG_CAN_PRESS_HEAVY_SWITCHES)) { + DynaPolyActor_SetHeavySwitchPressed(dynaActor); } } } diff --git a/mm/src/code/z_bg_item.c b/mm/src/code/z_bg_item.c index cedd77194..ba445f13f 100644 --- a/mm/src/code/z_bg_item.c +++ b/mm/src/code/z_bg_item.c @@ -51,12 +51,12 @@ void DynaPoly_SetPlayerAbove(CollisionContext* colCtx, s32 bgId) { } } -void DynaPolyActor_SetActorOnSwitch(DynaPolyActor* dynaActor) { - dynaActor->interactFlags |= DYNA_INTERACT_ACTOR_ON_SWITCH; +void DynaPolyActor_SetSwitchPressed(DynaPolyActor* dynaActor) { + dynaActor->interactFlags |= DYNA_INTERACT_ACTOR_SWITCH_PRESSED; } -void DynaPolyActor_SetActorOnHeavySwitch(DynaPolyActor* dynaActor) { - dynaActor->interactFlags |= DYNA_INTERACT_ACTOR_ON_HEAVY_SWITCH; +void DynaPolyActor_SetHeavySwitchPressed(DynaPolyActor* dynaActor) { + dynaActor->interactFlags |= DYNA_INTERACT_ACTOR_HEAVY_SWITCH_PRESSED; } s32 DynaPolyActor_IsActorOnTop(DynaPolyActor* dynaActor) { @@ -84,7 +84,7 @@ s32 DynaPolyActor_IsPlayerAbove(DynaPolyActor* dynaActor) { } s32 DynaPolyActor_IsSwitchPressed(DynaPolyActor* dynaActor) { - if (dynaActor->interactFlags & DYNA_INTERACT_ACTOR_ON_SWITCH) { + if (dynaActor->interactFlags & DYNA_INTERACT_ACTOR_SWITCH_PRESSED) { return true; } else { return false; @@ -92,7 +92,7 @@ s32 DynaPolyActor_IsSwitchPressed(DynaPolyActor* dynaActor) { } s32 DynaPolyActor_IsHeavySwitchPressed(DynaPolyActor* dynaActor) { - if (dynaActor->interactFlags & DYNA_INTERACT_ACTOR_ON_HEAVY_SWITCH) { + if (dynaActor->interactFlags & DYNA_INTERACT_ACTOR_HEAVY_SWITCH_PRESSED) { return true; } else { return false; diff --git a/mm/src/code/z_player_call.c b/mm/src/code/z_player_call.c index 292c773f3..adb77b32f 100644 --- a/mm/src/code/z_player_call.c +++ b/mm/src/code/z_player_call.c @@ -4,7 +4,7 @@ #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_FRIENDLY | ACTOR_FLAG_10 | ACTOR_FLAG_20 | ACTOR_FLAG_200000 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCH | ACTOR_FLAG_80000000) + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES | ACTOR_FLAG_80000000) ActorFunc sPlayerCallInitFunc; ActorFunc sPlayerCallDestroyFunc; |