mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 06:52:03 +00:00
Code Issues Projects Releases Wiki Activity

Player Docs: Player_ActionChange_6, Rolling and Put Away (#1949)

Browse source 
* progress

* changing branches

* start comments

* last few changes

* name the handler after rolling only

* comment tweak

* format
This commit is contained in:
fig02 2024-09-25 15:46:15 -04:00 • committed by GitHub
parent 7ccb0a641e
commit 8ff4faa084
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 99 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -1095,7 +1095,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
} else if (naviHoverActor == NULL || naviHoverActor->category == ACTORCAT_NPC) {
if (naviHoverActor != NULL) {
this->unk_2C0 = 100;
player->stateFlags2 |= PLAYER_STATE2_20;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
temp = 0;
} else {
switch (this->unk_2A8) {
@ -1116,7 +1116,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
this->unk_2AE--;
temp = 7;
} else {
player->stateFlags2 |= PLAYER_STATE2_20;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
temp = 0;
}
} else {
@ -1146,7 +1146,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
switch (temp) {
case 0:
if (!(player->stateFlags2 & PLAYER_STATE2_20)) {
if (!(player->stateFlags2 & PLAYER_STATE2_NAVI_ACTIVE)) {
temp = 7;
if (this->unk_2C7 == 0) {
Actor_PlaySfx(&this->actor, NA_SE_EV_NAVY_VANISH);
@ -1154,7 +1154,7 @@ void func_80A0461C(EnElf* this, PlayState* play) {
}
break;
case 8:
if (player->stateFlags2 & PLAYER_STATE2_20) {
if (player->stateFlags2 & PLAYER_STATE2_NAVI_ACTIVE) {
func_80A0299C(this, 0x32);
this->unk_2C0 = 42;
temp = 11;
@ -1164,10 +1164,10 @@ void func_80A0461C(EnElf* this, PlayState* play) {
}
break;
case 7:
player->stateFlags2 &= ~PLAYER_STATE2_20;
player->stateFlags2 &= ~PLAYER_STATE2_NAVI_ACTIVE;
break;
default:
player->stateFlags2 |= PLAYER_STATE2_20;
player->stateFlags2 |= PLAYER_STATE2_NAVI_ACTIVE;
break;
}
}