diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/code_800430A0.c | 4 | ||||
| -rw-r--r-- | src/code/code_80043480.c | 8 | ||||
| -rw-r--r-- | src/code/z_player_call.c | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/code/code_800430A0.c b/src/code/code_800430A0.c index 64c1eee81..90ae85187 100644 --- a/src/code/code_800430A0.c +++ b/src/code/code_800430A0.c @@ -76,8 +76,8 @@ void func_80043334(CollisionContext* colCtx, Actor* actor, s32 bgId) { if (dynaActor != NULL) { DynaPolyActor_SetActorOnTop(dynaActor); - if (CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_26)) { - func_80043538(dynaActor); + if (CHECK_FLAG_ALL(actor->flags, ACTOR_FLAG_CAN_PRESS_SWITCHES)) { + DynaPolyActor_SetSwitchPressed(dynaActor); } } } diff --git a/src/code/code_80043480.c b/src/code/code_80043480.c index 83ca32149..1a4d9f58d 100644 --- a/src/code/code_80043480.c +++ b/src/code/code_80043480.c @@ -44,8 +44,8 @@ void DynaPoly_SetPlayerAbove(CollisionContext* colCtx, s32 floorBgId) { } } -void func_80043538(DynaPolyActor* dynaActor) { - dynaActor->interactFlags |= DYNA_INTERACT_3; +void DynaPolyActor_SetSwitchPressed(DynaPolyActor* dynaActor) { + dynaActor->interactFlags |= DYNA_INTERACT_ACTOR_SWITCH_PRESSED; } s32 DynaPolyActor_IsActorOnTop(DynaPolyActor* dynaActor) { @@ -72,8 +72,8 @@ s32 DynaPolyActor_IsPlayerAbove(DynaPolyActor* dynaActor) { } } -s32 func_800435B4(DynaPolyActor* dynaActor) { - if (dynaActor->interactFlags & DYNA_INTERACT_3) { +s32 DynaPolyActor_IsSwitchPressed(DynaPolyActor* dynaActor) { + if (dynaActor->interactFlags & DYNA_INTERACT_ACTOR_SWITCH_PRESSED) { return true; } else { return false; diff --git a/src/code/z_player_call.c b/src/code/z_player_call.c index 6859e5731..d6a473120 100644 --- a/src/code/z_player_call.c +++ b/src/code/z_player_call.c @@ -2,7 +2,7 @@ #define FLAGS \ (ACTOR_FLAG_ATTENTION_ENABLED | ACTOR_FLAG_HOSTILE | ACTOR_FLAG_4 | ACTOR_FLAG_5 | \ - ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_26) + ACTOR_FLAG_UPDATE_DURING_OCARINA | ACTOR_FLAG_CAN_PRESS_SWITCHES) #pragma increment_block_number "gc-eu:128 gc-eu-mq:128 gc-jp:128 gc-jp-ce:128 gc-jp-mq:128 gc-us:128 gc-us-mq:128" \ "ntsc-1.2:128 pal-1.1:128" |
