mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-10 01:44:36 +00:00
Code Issues Projects Releases Wiki Activity

Document ACTOR_FLAG_CAN_PRESS_SWITCHES (#2275)

Browse source 
* document switch activation

* format

* activate -> press

* fix comment
This commit is contained in:
fig02 2024-10-20 23:19:14 -04:00 • committed by GitHub
parent f4210323a2
commit 3677c11140
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
11 changed files with 23 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/code/code_800430A0.c
View file

@ -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);
}
}
}

8
src/code/code_80043480.c
View file

@ -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;

2
src/code/z_player_call.c
View file

@ -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"